From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 27 Jan 2014 14:40:53 +0000 (+0100)
Subject: iwlwifi: mvm: abort scheduled scan on scan request
X-Git-Tag: v3.15-rc1~113^2~289^2^2~102^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6623e84c4242942a988a810d1f5e6e7e2a36858;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed