X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Fmesh_plink.c;h=ec68d2046d24d894cc14452d9d88bd1d644ed379;hb=77fa76bb7f5589cd336e4da4a02e2d685b70ce0a;hp=cf12f616c5b1e9379268b91a857f4eba1f44302e;hpb=a6a58b4f14106e61e5d78aac7995686ed0d5eab8;p=pandora-kernel.git

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index cf12f616c5b1..ec68d2046d24 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -181,7 +181,8 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
 		if (action == PLINK_CONFIRM) {
 			pos = skb_put(skb, 4);
 			/* two-byte status code followed by two-byte AID */
-			memset(pos, 0, 4);
+			memset(pos, 0, 2);
+			memcpy(pos + 2, &plid, 2);
 		}
 		mesh_mgmt_ies_add(skb, sdata);
 	}