summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-11 14:19:31 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-11 14:19:31 -0800
commitba2dca91f000e4796c23d14834680dd90528842f (patch)
treefd27c7383f779c1276bed7a1ddaea81efc4395a2 /net/mac80211/mesh.c
parentc557c15d83ea16e6c1a043c8eccb0f60bb19cb96 (diff)
parent65182b9fb004220f250d4269c864cf0f1f372e85 (diff)
downloadkernel-crypto-ba2dca91f000e4796c23d14834680dd90528842f.tar.gz
kernel-crypto-ba2dca91f000e4796c23d14834680dd90528842f.tar.xz
kernel-crypto-ba2dca91f000e4796c23d14834680dd90528842f.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index c0fe46493f7..6a433142959 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -427,7 +427,7 @@ int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
char *addr5, char *addr6)
{
int aelen = 0;
- memset(meshhdr, 0, sizeof(meshhdr));
+ memset(meshhdr, 0, sizeof(*meshhdr));
meshhdr->ttl = sdata->u.mesh.mshcfg.dot11MeshTTL;
put_unaligned(cpu_to_le32(sdata->u.mesh.mesh_seqnum), &meshhdr->seqnum);
sdata->u.mesh.mesh_seqnum++;