git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mac80211: set the AID field correctly for mesh peer frames
[safe/jmp/linux-2.6]
/
net
/
mac80211
/
mesh_plink.c
diff --git
a/net/mac80211/mesh_plink.c
b/net/mac80211/mesh_plink.c
index
cf12f61
..
ec68d20
100644
(file)
--- 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);
}