diff options
Diffstat (limited to 'net/mac80211/work.c')
-rw-r--r-- | net/mac80211/work.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index ac3549690b8e..d2e7f0e86677 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c | |||
@@ -190,9 +190,8 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata, | |||
190 | struct sk_buff *skb; | 190 | struct sk_buff *skb; |
191 | struct ieee80211_mgmt *mgmt; | 191 | struct ieee80211_mgmt *mgmt; |
192 | u8 *pos, qos_info; | 192 | u8 *pos, qos_info; |
193 | const u8 *ies; | ||
194 | size_t offset = 0, noffset; | 193 | size_t offset = 0, noffset; |
195 | int i, len, count, rates_len, supp_rates_len; | 194 | int i, count, rates_len, supp_rates_len; |
196 | u16 capab; | 195 | u16 capab; |
197 | struct ieee80211_supported_band *sband; | 196 | struct ieee80211_supported_band *sband; |
198 | u32 rates = 0; | 197 | u32 rates = 0; |
@@ -277,7 +276,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata, | |||
277 | } | 276 | } |
278 | 277 | ||
279 | /* SSID */ | 278 | /* SSID */ |
280 | ies = pos = skb_put(skb, 2 + wk->assoc.ssid_len); | 279 | pos = skb_put(skb, 2 + wk->assoc.ssid_len); |
281 | *pos++ = WLAN_EID_SSID; | 280 | *pos++ = WLAN_EID_SSID; |
282 | *pos++ = wk->assoc.ssid_len; | 281 | *pos++ = wk->assoc.ssid_len; |
283 | memcpy(pos, wk->assoc.ssid, wk->assoc.ssid_len); | 282 | memcpy(pos, wk->assoc.ssid, wk->assoc.ssid_len); |
@@ -287,7 +286,6 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata, | |||
287 | if (supp_rates_len > 8) | 286 | if (supp_rates_len > 8) |
288 | supp_rates_len = 8; | 287 | supp_rates_len = 8; |
289 | 288 | ||
290 | len = sband->n_bitrates; | ||
291 | pos = skb_put(skb, supp_rates_len + 2); | 289 | pos = skb_put(skb, supp_rates_len + 2); |
292 | *pos++ = WLAN_EID_SUPP_RATES; | 290 | *pos++ = WLAN_EID_SUPP_RATES; |
293 | *pos++ = supp_rates_len; | 291 | *pos++ = supp_rates_len; |