aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-10-04 15:07:33 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-10-11 16:41:07 -0400
commitdcd83976bea3ae3bc0822ed26cf200d9d6203121 (patch)
treede9edc5d588be582ad5c07f400094beedd5c170b /net
parentMerge branch 'for-linville' of git://github.com/lucacoelho/wl12xx (diff)
downloadlinux-dev-dcd83976bea3ae3bc0822ed26cf200d9d6203121.tar.xz
linux-dev-dcd83976bea3ae3bc0822ed26cf200d9d6203121.zip
mac80211: pass no-CCK flag through to HW scan
This is needed so that offloaded scan can do the right thing. Without this patch, the no_cck flag contains random values from the kernel heap. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/scan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 830e60f65779..397343a59275 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -254,6 +254,7 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
req->ie, req->ie_len, band,
req->rates[band], 0);
local->hw_scan_req->ie_len = ielen;
+ local->hw_scan_req->no_cck = req->no_cck;
return true;
}