From 2fcb576b6dbadd4135440da313553a598f09a5c0 Mon Sep 17 00:00:00 2001
From: Rui Paulo <rpaulo@gmail.com>
Date: Mon, 9 Nov 2009 23:46:52 +0000
Subject: [PATCH] --- yaml --- r: 171736 b: refs/heads/master c:
 77fa76bb7f5589cd336e4da4a02e2d685b70ce0a h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/mac80211/mesh_plink.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 88bf9711f130..9087342bda44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6a58b4f14106e61e5d78aac7995686ed0d5eab8
+refs/heads/master: 77fa76bb7f5589cd336e4da4a02e2d685b70ce0a
diff --git a/trunk/net/mac80211/mesh_plink.c b/trunk/net/mac80211/mesh_plink.c
index cf12f616c5b1..ec68d2046d24 100644
--- a/trunk/net/mac80211/mesh_plink.c
+++ b/trunk/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);
 	}