diff options
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index ac79d5e8e0d..b70f7f09da6 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -47,7 +47,8 @@ void ieee80211_configure_filter(struct ieee80211_local *local) | |||
47 | if (atomic_read(&local->iff_allmultis)) | 47 | if (atomic_read(&local->iff_allmultis)) |
48 | new_flags |= FIF_ALLMULTI; | 48 | new_flags |= FIF_ALLMULTI; |
49 | 49 | ||
50 | if (local->monitors || test_bit(SCAN_SW_SCANNING, &local->scanning)) | 50 | if (local->monitors || test_bit(SCAN_SW_SCANNING, &local->scanning) || |
51 | test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning)) | ||
51 | new_flags |= FIF_BCN_PRBRESP_PROMISC; | 52 | new_flags |= FIF_BCN_PRBRESP_PROMISC; |
52 | 53 | ||
53 | if (local->fif_probe_req || local->probe_req_reg) | 54 | if (local->fif_probe_req || local->probe_req_reg) |
@@ -148,6 +149,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) | |||
148 | } | 149 | } |
149 | 150 | ||
150 | if (test_bit(SCAN_SW_SCANNING, &local->scanning) || | 151 | if (test_bit(SCAN_SW_SCANNING, &local->scanning) || |
152 | test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning) || | ||
151 | test_bit(SCAN_HW_SCANNING, &local->scanning)) | 153 | test_bit(SCAN_HW_SCANNING, &local->scanning)) |
152 | power = chan->max_power; | 154 | power = chan->max_power; |
153 | else | 155 | else |