| commit | 22731c4b03371594e3bfdf032a64ee3cc6e61365 | |
| author | Johannes Berg <johannes@sipsolutions.net> | |
| Sat, 31 Oct 2009 06:44:08 +0000 (31 07:44 +0100) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Fri, 18 Dec 2009 22:04:24 +0000 (18 14:04 -0800) | ||
| tree | 9bf4216640b7bb49a9368428889bb514012b7f26 | treesnapshot (tar.gz zip) |
| parent | c04c99abc6754fa92d428915ac4215994fe95609 | commitdiff |
mac80211: fix scan abort sanity checks
commit 6d3560d4fc9c5b9fe1a07a63926ea70512c69c32 upstream.
Since sometimes mac80211 queues up a scan request
to only act on it later, it must be allowed to
(internally) cancel a not-yet-running scan, e.g.
when the interface is taken down. This condition
was missing since we always checked only the
local->scanning variable which isn't yet set in
that situation.
Reported-by: Luis R. Rodriguez <mcgrof@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6d3560d4fc9c5b9fe1a07a63926ea70512c69c32 upstream.
Since sometimes mac80211 queues up a scan request
to only act on it later, it must be allowed to
(internally) cancel a not-yet-running scan, e.g.
when the interface is taken down. This condition
was missing since we always checked only the
local->scanning variable which isn't yet set in
that situation.
Reported-by: Luis R. Rodriguez <mcgrof@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| net/mac80211/scan.c | diffblobblamehistory |