summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2009-07-23 12:14:04 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-27 15:24:16 -0400
commitfbe9c429f195111bbf7f1630efa19aee295fd8e7 (patch)
tree80556ac48bfa0e7d60db63e6c71b0bbf58143263 /net/mac80211/ibss.c
parent2fb3f028a9a46bd344329766257699b4acb36525 (diff)
downloadop-kernel-dev-fbe9c429f195111bbf7f1630efa19aee295fd8e7.zip
op-kernel-dev-fbe9c429f195111bbf7f1630efa19aee295fd8e7.tar.gz
mac80211: Replace {sw, hw}_scanning variables with a bitfield
Use a bitfield to store the current scan mode instead of two boolean variables {sw,hw}_scanning. This patch does not introduce functional changes but allows us to enhance the scan flags later (for example for background scanning). Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 8e22200..6e3cca6 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))
OpenPOWER on IntegriCloud