mac80211: fix the setting of extended supported rate IE
The patch "mac80211: select and adjust bitrates according to channel mode" causes regression and breaks the extended supported rate IE setting. Since "i" is starting with 8, so this is not necessary to introduce "skip" here. Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@cozybit.com> Signed-off-by: Colleen Twitty <colleen@cozybit.com> Reviewed-by: Jason Abele <jason@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Родитель
6329b8d917
Коммит
cc63ec766b
|
@ -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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче