From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 4 Oct 2011 13:07:33 +0000 (+0200)
Subject: mac80211: pass no-CCK flag through to HW scan
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=dcd83976bea3ae3bc0822ed26cf200d9d6203121;p=deliverable%2Flinux.git

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

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;
 }