hostapd: Do not change HT40 capability due to OBSS scan
The capability itself isn't really affected by an OBSS scan, only the HT operation must then be restricted to 20 MHz. Change this, and therefore use the secondary channel configuration to determine the setting of the OP_MODE_20MHZ_HT_STA_ASSOCED flag. This shouldn't really change anything functionally, it just makes the code a little less confusing and is also needed to implement more dynamic bandwidth changes if ever desired. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
a24a5ccb28
commit
3aea5fbe3b
2 changed files with 1 additions and 3 deletions
|
@ -443,7 +443,6 @@ static void ieee80211n_check_scan(struct hostapd_iface *iface)
|
|||
iface->conf->channel +
|
||||
iface->conf->secondary_channel * 4);
|
||||
iface->conf->secondary_channel = 0;
|
||||
iface->conf->ht_capab &= ~HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET;
|
||||
}
|
||||
|
||||
res = ieee80211n_allowed_ht40_channel_pair(iface);
|
||||
|
|
|
@ -133,8 +133,7 @@ int hostapd_ht_operation_update(struct hostapd_iface *iface)
|
|||
new_op_mode = 0;
|
||||
if (iface->num_sta_no_ht)
|
||||
new_op_mode = OP_MODE_MIXED;
|
||||
else if ((iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)
|
||||
&& iface->num_sta_ht_20mhz)
|
||||
else if (iface->conf->secondary_channel && iface->num_sta_ht_20mhz)
|
||||
new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED;
|
||||
else if (iface->olbc_ht)
|
||||
new_op_mode = OP_MODE_MAY_BE_LEGACY_STAS;
|
||||
|
|
Loading…
Reference in a new issue