Commit 93c75786 authored Jul 11, 2013 by Simon Wunderlich Committed by Johannes Berg Jul 16, 2013

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 <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 2ec9c1f6

net/mac80211/ibss.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -168,9 +168,11 @@ 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) {
		*pos++ = WLAN_EID_DS_PARAMS;