diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-01 11:12:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-01 11:12:36 -0400 |
| commit | 41f4a6f71fe33faa7971c173c263fb431fe987fe (patch) | |
| tree | fdc3e603162e3ad63f6ae4160f68eb803bb78d58 /net/mac80211/scan.c | |
| parent | 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 (diff) | |
| parent | 1728943d83e9fd919e454332fe344944123b3c3a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index d60389ba9b95..5171a9581631 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -242,7 +242,8 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local) local->hw_scan_req->n_channels = n_chans; ielen = ieee80211_build_preq_ies(local, (u8 *)local->hw_scan_req->ie, - req->ie, req->ie_len, band); + req->ie, req->ie_len, band, (u32) -1, + 0); local->hw_scan_req->ie_len = ielen; return true; |