Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 237014
b: refs/heads/master
c: 2cf22b8
h: refs/heads/master
v: v3
  • Loading branch information
Ben Greear authored and John W. Linville committed Feb 3, 2011
1 parent 4f62906 commit b6a82f8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4e6975f7b8ca31febaa94a1ee1acfb5322f8a82b
refs/heads/master: 2cf22b897c63df65e7360a1897e5312c58617fbd
9 changes: 8 additions & 1 deletion trunk/net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b6a82f8

Please sign in to comment.