---

yaml --- r: 171736 b: refs/heads/master c: 77fa76b h: refs/heads/master v: v3
git-mirror · Nov 13, 2009 · 2fcb576 · 2fcb576
1 parent 89f3c08
commit 2fcb576
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 	}