diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-10 22:15:31 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-10 22:15:31 -0800 |
commit | 8877870f8a8127b653f8c9a55c6b4de9f96f639b (patch) | |
tree | cc2629911f6b011ee2e3f4a85febbb9b6cc63604 /net/mac80211 | |
parent | 7a1abd08d52fdeddb3e9a5a33f2f15cc6a5674d2 (diff) | |
parent | 7379efeacb707f49729080791a7a562d8996aec4 (diff) | |
download | linux-8877870f8a8127b653f8c9a55c6b4de9f96f639b.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/iface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index f9163b12c7f1..7aa85591dbe7 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -391,6 +391,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, u32 hw_reconf_flags = 0; int i; + if (local->scan_sdata == sdata) + ieee80211_scan_cancel(local); + clear_bit(SDATA_STATE_RUNNING, &sdata->state); /* @@ -523,9 +526,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, synchronize_rcu(); skb_queue_purge(&sdata->skb_queue); - if (local->scan_sdata == sdata) - ieee80211_scan_cancel(local); - /* * Disable beaconing here for mesh only, AP and IBSS * are already taken care of. |