aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGravatar David Spinadel <david.spinadel@intel.com> 2015-03-17 19:58:38 +0200
committerGravatar Johannes Berg <johannes.berg@intel.com> 2015-03-30 10:19:13 +0200
commit7d830a198689bd33057923e0370147d43241c7f0 (patch)
treee43608fe1328d857965f6ff2ac3c9fca605cff20 /net
parentnl80211: add net-detect delay to wowlan info (diff)
downloadlinux-7d830a198689bd33057923e0370147d43241c7f0.tar.gz
linux-7d830a198689bd33057923e0370147d43241c7f0.tar.bz2
linux-7d830a198689bd33057923e0370147d43241c7f0.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 22b125913661..4a01a836f870 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -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;
}