Commit 7d830a19 authored Mar 17, 2015 by David Spinadel Committed by Johannes Berg Mar 30, 2015

mac80211: stop scan before connection



Stop scan before authentication or association to make sure
that nothing interferes with connection flow.

Currently mac80211 defers RX auth and assoc packets (among other ones)
until after the scan is complete, so auth during scan is likely to fail
if scan took too much time.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 21fea567

net/mac80211/mlme.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -4439,6 +4439,10 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
		} else
		WARN_ON_ONCE(!ether_addr_equal(ifmgd->bssid, cbss->bssid));

		/* Cancel scan to ensure that nothing interferes with connection */
		if (local->scanning)
		ieee80211_scan_cancel(local);

		return 0;
		}