Commit dc9f48ce authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville

mac80211: Fix scan_ies_len to include DS Params

Commit 651b5225 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: default avatarJouni Malinen <j@w1.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d654567d
...@@ -677,10 +677,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ...@@ -677,10 +677,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
/* /*
* Calculate scan IE length -- we need this to alloc * Calculate scan IE length -- we need this to alloc
* memory and to subtract from the driver limit. It * 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. * 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) if (supp_ht)
local->scan_ies_len += 2 + sizeof(struct ieee80211_ht_cap); local->scan_ies_len += 2 + sizeof(struct ieee80211_ht_cap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment