diff options
| author | Ben Greear <greearb@candelatech.com> | 2011-01-31 11:30:09 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-03 16:44:43 -0500 |
| commit | 2cf22b897c63df65e7360a1897e5312c58617fbd (patch) | |
| tree | 6fe5490470468b749f8d9dedd60834b0c46d2716 | |
| parent | 4e6975f7b8ca31febaa94a1ee1acfb5322f8a82b (diff) | |
| download | kernel-common-2cf22b897c63df65e7360a1897e5312c58617fbd.tar.gz kernel-common-2cf22b897c63df65e7360a1897e5312c58617fbd.tar.bz2 kernel-common-2cf22b897c63df65e7360a1897e5312c58617fbd.zip | |
mac80211: Recalculate channel-type on iface removal.
When a vif goes away, it could cause the super-chan
to be recalculated differently, so do that calculation
on iface removal.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/iface.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 8acba456744e..5a4e19b88032 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -382,6 +382,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, *tmp; u32 hw_reconf_flags = 0; int i; + enum nl80211_channel_type orig_ct; if (local->scan_sdata == sdata) ieee80211_scan_cancel(local); @@ -542,8 +543,14 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, hw_reconf_flags = 0; } + /* Re-calculate channel-type, in case there are multiple vifs + * on different channel types. + */ + orig_ct = local->_oper_channel_type; + ieee80211_set_channel_type(local, NULL, NL80211_CHAN_NO_HT); + /* do after stop to avoid reconfiguring when we stop anyway */ - if (hw_reconf_flags) + if (hw_reconf_flags || (orig_ct != local->_oper_channel_type)) ieee80211_hw_config(local, hw_reconf_flags); spin_lock_irqsave(&local->queue_stop_reason_lock, flags); |