From: Simon Wunderlich Date: Thu, 11 Jul 2013 18:29:49 +0000 (+0200) Subject: mac80211: fix off-by-one regression in ibss beacon generation X-Git-Tag: MMI-PSA29.97-13-9~13727^2~84^2^2~6^2~32 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93c75786e8d8e8e245a479209a84b19292d08e7e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git mac80211: fix off-by-one regression in ibss beacon generation There is an off-by-one error in the beacon generation for the ibss mode, falsely a rate the extended supported rates which was already added to supported rates, messing up the beacon. This was introduced by commit "mac80211: select and adjust bitrates according to channel mode". Signed-off-by: Simon Wunderlich Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 83197c3ae5f1..5e6836c3aa4c 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -168,8 +168,10 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, if (basic_rates & BIT(ri)) basic = 0x80; *pos++ = basic | (u8) rate; - if (++rates_added == 8) + if (++rates_added == 8) { + ri++; /* continue at next rate for EXT_SUPP_RATES */ break; + } } if (sband->band == IEEE80211_BAND_2GHZ) {