diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-05-08 20:47:39 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-05-11 15:23:57 -0400 |
| commit | 9ed6bcce77f75d98af6ee07069deac6041948bee (patch) | |
| tree | 9fff3d257612ed049b28a80681fbd987f4de3ec4 /include/net/mac80211.h | |
| parent | 5a9940118a616266183c53a9ee4352feadb9c2e8 (diff) | |
| download | op-kernel-dev-9ed6bcce77f75d98af6ee07069deac6041948bee.zip op-kernel-dev-9ed6bcce77f75d98af6ee07069deac6041948bee.tar.gz | |
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>
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 38dc1cd..03591fc 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -171,14 +171,6 @@ enum ieee80211_bss_change { }; /** - * 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 * * This structure keeps information about a BSS (and an association @@ -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; }; /** |
