From: Bob Copeland Date: Tue, 14 Jul 2015 12:31:55 +0000 (-0400) Subject: mac80211: correct aid location in peering frames X-Git-Tag: v4.2-rc8~16^2~6^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ea752cd2ce066c5d8c1807b5310ef329885cecb;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git 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 Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 5438d13..f17127e 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -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) ||