summaryrefslogtreecommitdiff
path: root/net/ieee80211
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-11-30 15:29:27 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2007-11-30 15:29:27 +0300
commit75e7766680b4b196073bdc941b8a6570b9f777af (patch)
tree71ce4e83878a3dd9a83559c7d51ec549668cef3a /net/ieee80211
parentb7e0fe9f81e19c4f2a1369b324c3c062c1738be4 (diff)
parent53cb4791c156908ae634de31949f7f25f8de002b (diff)
downloadlinux-75e7766680b4b196073bdc941b8a6570b9f777af.tar.xz
Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/ieee80211')
-rw-r--r--net/ieee80211/ieee80211_tx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index a4c3c51140a3..6d06f1385e28 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -144,7 +144,8 @@ static int ieee80211_copy_snap(u8 * data, u16 h_proto)
snap->oui[1] = oui[1];
snap->oui[2] = oui[2];
- *(u16 *) (data + SNAP_SIZE) = htons(h_proto);
+ h_proto = htons(h_proto);
+ memcpy(data + SNAP_SIZE, &h_proto, sizeof(u16));
return SNAP_SIZE + sizeof(u16);
}