diff options
| author | John W. Linville <[email protected]> | 2011-10-17 19:05:26 +0000 |
|---|---|---|
| committer | John W. Linville <[email protected]> | 2011-10-17 19:05:26 +0000 |
| commit | 41ebe9cde738a972d05c7282e09f5ed54cff0e8d (patch) | |
| tree | 223bf0feb7305e46989b60c3f070bef87d5fcab4 /net/mac80211/scan.c | |
| parent | igbvf: convert to ndo_fix_features (diff) | |
| parent | libertas: fix changing interface type when interface is down (diff) | |
| download | kernel-41ebe9cde738a972d05c7282e09f5ed54cff0e8d.tar.gz kernel-41ebe9cde738a972d05c7282e09f5ed54cff0e8d.zip | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 1 |
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; } |