mac80211: correctly close cancelled scans
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Mon, 16 Sep 2013 08:12:07 +0000 (11:12 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 28 Nov 2013 14:02:02 +0000 (14:02 +0000)
commit591c6cac8e8844d06e940774898c23f8684f5465
tree88fd0c79bf76e720faebf80d91719612545487c2
parent780e58dcd9f573fbee4cf32fb949958cad6901e3
mac80211: correctly close cancelled scans

commit a754055a1296fcbe6f32de3a5eaca6efb2fd1865 upstream.

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

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/mac80211/ieee80211_i.h
net/mac80211/scan.c