Commit 2ea752cd authored Jul 14, 2015 by Bob Copeland Committed by Johannes Berg Jul 17, 2015

mac80211: correct aid location in peering frames



According to 802.11-2012 8.5.16.3.2 AID comes directly after the
capability bytes in mesh peering confirm frames.  The existing
code, however, was adding a 2 byte offset to this location,
resulting in garbage data going out over the air.  Remove the
offset to fix it.

Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 042ab5fc

net/mac80211/mesh_plink.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
		if (action == WLAN_SP_MESH_PEERING_CONFIRM) {
		/* AID */
		pos = skb_put(skb, 2);
		put_unaligned_le16(plid, pos + 2);
		put_unaligned_le16(plid, pos);
		}
		if (ieee80211_add_srates_ie(sdata, skb, true, band) \|\|
		ieee80211_add_ext_srates_ie(sdata, skb, true, band) \|\|