]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
mac80211: correctly close cancelled scans
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Mon, 16 Sep 2013 08:12:07 +0000 (11:12 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 9 Oct 2013 16:40:07 +0000 (18:40 +0200)
commita754055a1296fcbe6f32de3a5eaca6efb2fd1865
tree6812b556c369c031478a94d6de4b2b6259bd2ca9
parent22c4ceed0184318ec5a6182c6d75d398452c2e39
mac80211: correctly close cancelled scans

__ieee80211_scan_completed is called from a worker. This
means that the following flow is possible.

 * driver calls ieee80211_scan_completed
 * mac80211 cancels the scan (that is already complete)
 * __ieee80211_scan_completed runs

When scan_work will finally run, it will see that the scan
hasn't been aborted and might even trigger another scan on
another band. This leads to a situation where cfg80211's
scan is not done and no further scan can be issued.

Fix this by setting a new flag when a HW scan is being
cancelled so that no other scan will be triggered.

Cc: stable@vger.kernel.org
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/ieee80211_i.h
net/mac80211/scan.c