mac80211: Fix HT channel selection
HT management is done differently for AP and STA modes, unify to just the ->config() callback since HT is fundamentally a PHY property and cannot be per-BSS. Rename enum nl80211_sec_chan_offset as nl80211_channel_type to denote the channel type ( NO_HT, HT20, HT40+, HT40- ). Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
@@ -165,14 +165,9 @@ enum ieee80211_bss_change {
|
||||
|
||||
/**
|
||||
* struct ieee80211_bss_ht_conf - BSS's changing HT configuration
|
||||
* @secondary_channel_offset: secondary channel offset, uses
|
||||
* %IEEE80211_HT_PARAM_CHA_SEC_ values
|
||||
* @width_40_ok: indicates that 40 MHz bandwidth may be used for TX
|
||||
* @operation_mode: HT operation mode (like in &struct ieee80211_ht_info)
|
||||
*/
|
||||
struct ieee80211_bss_ht_conf {
|
||||
u8 secondary_channel_offset;
|
||||
bool width_40_ok;
|
||||
u16 operation_mode;
|
||||
};
|
||||
|
||||
@@ -508,9 +503,7 @@ static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
|
||||
|
||||
struct ieee80211_ht_conf {
|
||||
bool enabled;
|
||||
int sec_chan_offset; /* 0 = HT40 disabled; -1 = HT40 enabled, secondary
|
||||
* channel below primary; 1 = HT40 enabled,
|
||||
* secondary channel above primary */
|
||||
enum nl80211_channel_type channel_type;
|
||||
};
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user