iwlwifi: mvm: abort scheduled scan on scan request
authorJohannes Berg <johannes.berg@intel.com>
Mon, 27 Jan 2014 14:40:53 +0000 (15:40 +0100)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Mon, 3 Feb 2014 20:43:50 +0000 (22:43 +0200)
commita6623e84c4242942a988a810d1f5e6e7e2a36858
tree602f5d93ffd2757f83b113f8e43d6edfd133284b
parent84b0312eee685bd0b2ca250dcea7049c8be4b655
iwlwifi: mvm: abort scheduled scan on scan request

Some older versions of wpa_supplicant don't necessarily stop
scheduled scan before starting a regular scan, and there's
nothing in the API that requires it either. As a consequence
our driver's behaviour of not allowing scan while scheduled
scan was in progress broke userspace.

However, it is valid to unilaterally stop scheduled scan at
any point in time, so when a regular scan request comes just
abort the scheduled scan and run the regular scan.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Alexander Bondar <alexander.bondar@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/ops.c
drivers/net/wireless/iwlwifi/mvm/scan.c