diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-03 16:00:03 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-03 16:00:03 -0400 |
| commit | 1eea72f03a139146f341e450cf56934b2e01a4d3 (patch) | |
| tree | 65c8d14751a9920263722eea64784e87a246ec66 /net/mac80211/util.c | |
| parent | 569943d0639c85a451ea853087cbd5f738247dd9 (diff) | |
| parent | f69727fd78fa761dc49ee3091c432a8c6ab81292 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index e1b34a18b24..9c3200bcfc0 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2103,7 +2103,7 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata, { struct ieee80211_local *local = sdata->local; struct ieee80211_supported_band *sband; - int rate, skip, shift; + int rate, shift; u8 i, exrates, *pos; u32 basic_rates = sdata->vif.bss_conf.basic_rates; u32 rate_flags; @@ -2131,14 +2131,11 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata, pos = skb_put(skb, exrates + 2); *pos++ = WLAN_EID_EXT_SUPP_RATES; *pos++ = exrates; - skip = 0; for (i = 8; i < sband->n_bitrates; i++) { u8 basic = 0; if ((rate_flags & sband->bitrates[i].flags) != rate_flags) continue; - if (skip++ < 8) - continue; if (need_basic && basic_rates & BIT(i)) basic = 0x80; rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, |