diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-27 15:48:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-27 15:48:50 -0700 |
| commit | 6250b1993828af53d4a71b24b53d62cbf9a31318 (patch) | |
| tree | 9090de31068a0abffb34e21dba2dd2cf884eb3c5 /include | |
| parent | 95a99fbf300135cd47d4a76736780936c12eda3b (diff) | |
| parent | 0d7846f7e63f9e97c587b1bf34d417dca894cd81 (diff) | |
Merge "cfg80211: Add support to configure a beacon data rate"
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 801315d1d405..9076fd9f92b2 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -695,6 +695,18 @@ struct cfg80211_acl_data { struct mac_address mac_addrs[]; }; +/* + * cfg80211_bitrate_mask - masks for bitrate control + */ +struct cfg80211_bitrate_mask { + struct { + u32 legacy; + u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN]; + u16 vht_mcs[NL80211_VHT_NSS_MAX]; + enum nl80211_txrate_gi gi; + } control[IEEE80211_NUM_BANDS]; +}; + /** * struct cfg80211_ap_settings - AP configuration * @@ -719,6 +731,7 @@ struct cfg80211_acl_data { * MAC address based access control * @pbss: If set, start as a PCP instead of AP. Relevant for DMG * networks. + * @beacon_rate: masks for setting user configured beacon tx rate. */ struct cfg80211_ap_settings { struct cfg80211_chan_def chandef; @@ -738,6 +751,7 @@ struct cfg80211_ap_settings { bool p2p_opp_ps; const struct cfg80211_acl_data *acl; bool pbss; + struct cfg80211_bitrate_mask beacon_rate; }; /** @@ -1945,17 +1959,6 @@ enum wiphy_params_flags { WIPHY_PARAM_DYN_ACK = 1 << 5, }; -/* - * cfg80211_bitrate_mask - masks for bitrate control - */ -struct cfg80211_bitrate_mask { - struct { - u32 legacy; - u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN]; - u16 vht_mcs[NL80211_VHT_NSS_MAX]; - enum nl80211_txrate_gi gi; - } control[IEEE80211_NUM_BANDS]; -}; /** * struct cfg80211_pmksa - PMK Security Association * |