diff options
| author | Jouni Malinen <j@w1.fi> | 2010-10-27 13:40:33 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-27 15:46:51 -0400 |
| commit | dc9f48ce7c7d345be31208def51572a8250a4a03 (patch) | |
| tree | c8989c1905d740bb49c1b186b909b8408c1a4315 /net | |
| parent | d654567dec75782d6fd9add4b7b9c50e0926d369 (diff) | |
| download | linux-next-dc9f48ce7c7d345be31208def51572a8250a4a03.tar.gz | |
mac80211: Fix scan_ies_len to include DS Params
Commit 651b52254fc061f02d965524e71de4333a009a5a added DS Parameter Set
information into Probe Request frames that are transmitted on 2.4 GHz
band, but it failed to increment local->scan_ies_len to cover this new
information. This variable needs to be updated to match the maximum IE
data length so that the extra buffer need gets reduced from the driver
limit.
Signed-off-by: Jouni Malinen <j@w1.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 6b322fa681f5..107a0cbe52ac 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -677,10 +677,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) /* * Calculate scan IE length -- we need this to alloc * memory and to subtract from the driver limit. It - * includes the (extended) supported rates and HT + * includes the DS Params, (extended) supported rates, and HT * information -- SSID is the driver's responsibility. */ - local->scan_ies_len = 4 + max_bitrates; /* (ext) supp rates */ + local->scan_ies_len = 4 + max_bitrates /* (ext) supp rates */ + + 3 /* DS Params */; if (supp_ht) local->scan_ies_len += 2 + sizeof(struct ieee80211_ht_cap); |