mac80211: improve HT channel handling
Subsystems (2)
Johannes Berg
maintainerPATCH 1/1 mac80211: improve HT channel handling
Currently, when one interface switches HT mode, all others will follow along. This is clearly undesirable, since the new one might switch to no-HT while another one is operating in HT.
Address this issue by keeping track of the HT mode per interface, and allowing only changes that are compatible, i.e. switching into HT40+ is not possible when another interface is in HT40-, in that case the second one needs to fall back to HT20.
Also, to allow drivers to know what's going on, store the per-interface HT mode (channel type) in the virtual interface's bss_conf.
Signed-off-by Johannes Berg <[email protected]>
--- drivers/net/wireless/mac80211_hwsim.c | 19 ++++----- include/net/mac80211.h | 4 + net/mac80211/cfg.c | 23 ++++++++--- net/mac80211/chan.c | 70 ++++++++++++++++++++++++++++++++++ net/mac80211/ibss.c | 5 +- net/mac80211/ieee80211_i.h | 5 +- net/mac80211/main.c | 2 net/mac80211/mlme.c | 44 +++++++++++---------- 8 files changed, 132 insertions(+), 40 deletions(-)
include/net/mac80211.h +4 -0
@@ -191,6 +191,9 @@ enum ieee80211_bss_change {* the current band. * @bssid: The BSSID for this BSS * @enable_beacon: whether beaconing should be enabled or not +* @channel_type: Channel type for this BSS -- the hardware might be +* configured for HT40+ while this BSS only uses no-HT, for +* example. * @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. * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero value
@@ -215,6 +218,7 @@ struct ieee80211_bss_conf {u16 ht_operation_mode;s32 cqm_rssi_thold;u32 cqm_rssi_hyst; +enum nl80211_channel_type channel_type; };/**
net/mac80211/cfg.c +17 -6
@@ -1167,23 +1167,34 @@ static int ieee80211_set_channel(struct enum nl80211_channel_type channel_type) {struct ieee80211_local *local =wiphy_priv (wiphy); +struct ieee80211_sub_if_data *sdata =NULL ; + +if (netdev) + sdata =IEEE80211_DEV_TO_SUB_IF (netdev);switch (ieee80211_get_channel_mode (local,NULL )) {case CHAN_MODE_HOPPING :return -EBUSY ;case CHAN_MODE_FIXED : -if (local->oper_channel == chan && - local->oper_channel_type == channel_type) +if (local->oper_channel != chan) +return -EBUSY ; +if (!sdata && local->_oper_channel_type == channel_type)return 0 ; -return -EBUSY ; +break ;case CHAN_MODE_UNDEFINED :break ; } local->oper_channel = chan; - local->oper_channel_type = channel_type; -return ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_CHANNEL ); +if (!ieee80211_set_channel_type (local, sdata, channel_type)) +return -EBUSY ; + +ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_CHANNEL ); +if (sdata && sdata->vif.type !=NL80211_IFTYPE_MONITOR ) +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_HT ); + +return 0 ; }#ifdef CONFIG_PM
@@ -1407,7 +1418,7 @@ int __ieee80211_request_smps(struct ieee* association, there's no need to send an action frame. */ if (!sdata->u.mgd.associated || - sdata->local->oper_channel_type ==NL80211_CHAN_NO_HT ) { + sdata->vif.bss_conf.channel_type ==NL80211_CHAN_NO_HT ) {mutex_lock (&sdata->local->iflist_mtx);ieee80211_recalc_smps (sdata->local, sdata);mutex_unlock (&sdata->local->iflist_mtx);
net/mac80211/chan.c +70 -0
79 lines not on this page · raw message
net/mac80211/ibss.c +3 -2
@@ -103,7 +103,7 @@ static void __ieee80211_sta_join_ibss(st sdata->drop_unencrypted = capability &WLAN_CAPABILITY_PRIVACY ?1 :0 ; local->oper_channel = chan; - local->oper_channel_type =NL80211_CHAN_NO_HT ; +WARN_ON (!ieee80211_set_channel_type (local, sdata,NL80211_CHAN_NO_HT ));ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_CHANNEL ); sband = local->hw.wiphy->bands[chan->band];
@@ -911,7 +911,8 @@ int ieee80211_ibss_join(struct ieee80211/* fix ourselves to that channel now already */ if (params->channel_fixed) { sdata->local->oper_channel = params->channel; - sdata->local->oper_channel_type =NL80211_CHAN_NO_HT ; +WARN_ON (!ieee80211_set_channel_type (sdata->local, sdata, +NL80211_CHAN_NO_HT )); }if (params->ie) {
net/mac80211/ieee80211_i.h +4 -1
@@ -768,7 +768,7 @@ struct ieee80211_local {enum mac80211_scan_state next_scan_state;struct delayed_work scan_work;struct ieee80211_sub_if_data *scan_sdata; -enum nl80211_channel_type oper_channel_type; +enum nl80211_channel_type _oper_channel_type;struct ieee80211_channel *oper_channel, *csa_channel;/* Temporary remain-on-channel for off-channel operations */
@@ -1239,6 +1239,9 @@ enum ieee80211_chan_mode {enum ieee80211_chan_mode ieee80211_get_channel_mode (struct ieee80211_local *local,struct ieee80211_sub_if_data *ignore); +bool ieee80211_set_channel_type (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata, +enum nl80211_channel_type chantype);#ifdef CONFIG_MAC80211_NOINLINE #define debug_noinline noinline
net/mac80211/main.c +1 -1
@@ -111,7 +111,7 @@ int ieee80211_hw_config(struct ieee80211 channel_type = local->tmp_channel_type; }else { chan = local->oper_channel; - channel_type = local->oper_channel_type; + channel_type = local->_oper_channel_type; } if (chan != local->hw.conf.channel ||
net/mac80211/mlme.c +23 -21
94 lines not on this page · raw message
drivers/net/wireless/mac80211_hwsim.c +10 -9
@@ -652,17 +652,17 @@ static void mac80211_hwsim_beacon(unsignadd_timer (&data->beacon_timer); } +static const char *hwsim_chantypes[] = { + [NL80211_CHAN_NO_HT ] ="noht" , + [NL80211_CHAN_HT20 ] ="ht20" , + [NL80211_CHAN_HT40MINUS ] ="ht40-" , + [NL80211_CHAN_HT40PLUS ] ="ht40+" , +};static int mac80211_hwsim_config (struct ieee80211_hw *hw,u32 changed) {struct mac80211_hwsim_data *data = hw->priv;struct ieee80211_conf *conf = &hw->conf; -static const char *chantypes[4 ] = { - [NL80211_CHAN_NO_HT ] ="noht" , - [NL80211_CHAN_HT20 ] ="ht20" , - [NL80211_CHAN_HT40MINUS ] ="ht40-" , - [NL80211_CHAN_HT40PLUS ] ="ht40+" , - };static const char *smps_modes[IEEE80211_SMPS_NUM_MODES ] = { [IEEE80211_SMPS_AUTOMATIC ] ="auto" , [IEEE80211_SMPS_OFF ] ="off" ,
@@ -673,7 +673,7 @@ static int mac80211_hwsim_config(structprintk (KERN_DEBUG "%s:%s (freq=%d/%s idle=%d ps=%d smps=%s)\n" ,wiphy_name (hw->wiphy), __func__, conf->channel->center_freq, - chantypes[conf->channel_type], + hwsim_chantypes[conf->channel_type], !!(conf->flags &IEEE80211_CONF_IDLE ), !!(conf->flags &IEEE80211_CONF_PS ), smps_modes[conf->smps_mode]);
@@ -761,9 +761,10 @@ static void mac80211_hwsim_bss_info_chan }if (changed &BSS_CHANGED_HT ) { -printk (KERN_DEBUG " %s: HT: op_mode=0x%x\n" , +printk (KERN_DEBUG " %s: HT: op_mode=0x%x, chantype=%s\n" ,wiphy_name (hw->wiphy), - info->ht_operation_mode); + info->ht_operation_mode, + hwsim_chantypes[info->channel_type]); }if (changed &BSS_CHANGED_BASIC_RATES ) {