Commit cd6c524e authored Dec 12, 2011 by Dmitry TARNYAGIN Committed by John W. Linville Dec 13, 2011

mac80211: Do not request FIF_BCN_PRBRESP_PROMISC for HW scan.



ieee80211_configure_filter code used local->scanning as a boolean
value when it was a bit mask. Bits SCAN_COMPLETED, SCAN_ABORTED
should not set FIF_BCN_PRBRESP_PROMISC filter.

SCAN_HW_SCANNING should not set FIF_BCN_PRBRESP_PROMISC either,
as there is no explicit filter configuration request from
scan code. If a driver requires FIF_BCN_PRBRESP_PROMISC mode
during HW scanning, it's up to the driver to temporary enable it.

Similar mistake was fixed also in ieee80211_hw_config (power
configuration code).

Verified-by: Vitaly Wool <vitaly.wool@sonyericsson.com>
Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 6539306b

net/mac80211/main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ void ieee80211_configure_filter(struct ieee80211_local *local)
		if (atomic_read(&local->iff_allmultis))
		new_flags \|= FIF_ALLMULTI;

		if (local->monitors \|\| local->scanning)
		if (local->monitors \|\| test_bit(SCAN_SW_SCANNING, &local->scanning))
		new_flags \|= FIF_BCN_PRBRESP_PROMISC;

		if (local->fif_probe_req \|\| local->probe_req_reg)
		@@ -150,8 +150,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
		changed \|= IEEE80211_CONF_CHANGE_SMPS;
		}

		if ((local->scanning & SCAN_SW_SCANNING) \|\|
		(local->scanning & SCAN_HW_SCANNING))
		if (test_bit(SCAN_SW_SCANNING, &local->scanning) \|\|
		test_bit(SCAN_HW_SCANNING, &local->scanning))
		power = chan->max_power;
		else
		power = local->power_constr_level ?

Admin message