diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-31 04:26:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-31 04:26:55 +0200 |
| commit | 2f6d7c1b34403b97fa57473edcb6749d1db5ace3 (patch) | |
| tree | 97da33c077b08b72a361ff5a4542b86d190b0164 /net/mac80211/ibss.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| parent | iwlwifi: debugFs to enable/disable HT40 support (diff) | |
| download | linux-2f6d7c1b34403b97fa57473edcb6749d1db5ace3.tar.xz linux-2f6d7c1b34403b97fa57473edcb6749d1db5ace3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 8e2220000e5c..6e3cca65c460 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -742,7 +742,7 @@ static void ieee80211_ibss_work(struct work_struct *work) if (!netif_running(sdata->dev)) return; - if (local->sw_scanning || local->hw_scanning) + if (local->scanning) return; if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_ADHOC)) |