summaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2016-09-14 09:37:54 +0200
committerJohannes Berg <johannes.berg@intel.com>2016-09-15 16:46:16 +0200
commit58bd7f1158ac7543ccdcddc7f4ecd7db458e6d0b (patch)
treec26cd752db7fd97b8a58900b8430c199f1d2da3d /net/mac80211/scan.c
parentmac80211: fix possible out-of-bounds access (diff)
downloadlinux-58bd7f1158ac7543ccdcddc7f4ecd7db458e6d0b.tar.xz
linux-58bd7f1158ac7543ccdcddc7f4ecd7db458e6d0b.zip
mac80211: fix scan completed tracing
Passing the 'info' pointer where a 'info->aborted' is expected will always lead to tracing to erroneously record that the scan was aborted, fix that by passing the correct info->aborted. The remaining data will be collected in cfg80211, so I haven't duplicated it here. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 070b40f15850..23d8ac829279 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -420,7 +420,7 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw,
{
struct ieee80211_local *local = hw_to_local(hw);
- trace_api_scan_completed(local, info);
+ trace_api_scan_completed(local, info->aborted);
set_bit(SCAN_COMPLETED, &local->scanning);
if (info->aborted)