diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-25 19:28:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-25 19:28:55 +0200 |
| commit | 22e95ac87d62bdc65b8a694a23cd4a364689b013 (patch) | |
| tree | 5ac900300ad1d4a8d8118545e3e971862de70ea4 /net/mac80211/iface.c | |
| parent | bug.h: Fix build with CONFIG_PRINTK disabled. (diff) | |
| parent | Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next... (diff) | |
| download | linux-22e95ac87d62bdc65b8a694a23cd4a364689b013.tar.xz linux-22e95ac87d62bdc65b8a694a23cd4a364689b013.zip | |
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 7dfbe71dc637..49d4f869e0bc 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -384,11 +384,11 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, int i; enum nl80211_channel_type orig_ct; + clear_bit(SDATA_STATE_RUNNING, &sdata->state); + if (local->scan_sdata == sdata) ieee80211_scan_cancel(local); - clear_bit(SDATA_STATE_RUNNING, &sdata->state); - /* * Stop TX on this interface first. */ |