mac80211: move HT operation mode BSS info
There really is no need to have a separate struct for a single variable. The fact that it exists is due to the code legacy, but we can remove that now. Very simple. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
5a9940118a
commit
9ed6bcce77
@@ -170,14 +170,6 @@ enum ieee80211_bss_change {
|
||||
BSS_CHANGED_BEACON_ENABLED = 1<<9,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ieee80211_bss_ht_conf - BSS's changing HT configuration
|
||||
* @operation_mode: HT operation mode (like in &struct ieee80211_ht_info)
|
||||
*/
|
||||
struct ieee80211_bss_ht_conf {
|
||||
u16 operation_mode;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ieee80211_bss_conf - holds the BSS's changing parameters
|
||||
*
|
||||
@@ -203,6 +195,8 @@ struct ieee80211_bss_ht_conf {
|
||||
* the current band.
|
||||
* @bssid: The BSSID for this BSS
|
||||
* @enable_beacon: whether beaconing should be enabled or not
|
||||
* @ht_operation_mode: HT operation mode (like in &struct ieee80211_ht_info).
|
||||
* This field is only valid when the channel type is one of the HT types.
|
||||
*/
|
||||
struct ieee80211_bss_conf {
|
||||
const u8 *bssid;
|
||||
@@ -219,7 +213,7 @@ struct ieee80211_bss_conf {
|
||||
u16 assoc_capability;
|
||||
u64 timestamp;
|
||||
u32 basic_rates;
|
||||
struct ieee80211_bss_ht_conf ht;
|
||||
u16 ht_operation_mode;
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user