diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2009-07-23 12:14:04 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-27 15:24:16 -0400 |
| commit | fbe9c429f195111bbf7f1630efa19aee295fd8e7 (patch) | |
| tree | 80556ac48bfa0e7d60db63e6c71b0bbf58143263 /net/mac80211/iface.c | |
| parent | 2fb3f028a9a46bd344329766257699b4acb36525 (diff) | |
| download | linux-exynos-fbe9c429f195111bbf7f1630efa19aee295fd8e7.tar.gz linux-exynos-fbe9c429f195111bbf7f1630efa19aee295fd8e7.tar.bz2 linux-exynos-fbe9c429f195111bbf7f1630efa19aee295fd8e7.zip | |
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/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 0cb29df09e35..d79a21105042 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -518,7 +518,7 @@ static int ieee80211_stop(struct net_device *dev) * the scan_sdata is NULL already don't send out a * scan event to userspace -- the scan is incomplete. */ - if (local->sw_scanning) + if (test_bit(SCAN_SW_SCANNING, &local->scanning)) ieee80211_scan_completed(&local->hw, true); } @@ -920,7 +920,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) struct ieee80211_sub_if_data *sdata; int count = 0; - if (local->hw_scanning || local->sw_scanning) + if (local->scanning) return ieee80211_idle_off(local, "scanning"); list_for_each_entry(sdata, &local->interfaces, list) { |