diff options
-rw-r--r-- | net/mac80211/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 60198ac664a0..145583625718 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -47,7 +47,7 @@ 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 || local->scanning) | 50 | if (local->monitors || test_bit(SCAN_SW_SCANNING, &local->scanning)) |
51 | new_flags |= FIF_BCN_PRBRESP_PROMISC; | 51 | new_flags |= FIF_BCN_PRBRESP_PROMISC; |
52 | 52 | ||
53 | if (local->fif_probe_req || local->probe_req_reg) | 53 | if (local->fif_probe_req || local->probe_req_reg) |
@@ -150,8 +150,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) | |||
150 | changed |= IEEE80211_CONF_CHANGE_SMPS; | 150 | changed |= IEEE80211_CONF_CHANGE_SMPS; |
151 | } | 151 | } |
152 | 152 | ||
153 | if ((local->scanning & SCAN_SW_SCANNING) || | 153 | if (test_bit(SCAN_SW_SCANNING, &local->scanning) || |
154 | (local->scanning & SCAN_HW_SCANNING)) | 154 | test_bit(SCAN_HW_SCANNING, &local->scanning)) |
155 | power = chan->max_power; | 155 | power = chan->max_power; |
156 | else | 156 | else |
157 | power = local->power_constr_level ? | 157 | power = local->power_constr_level ? |