From 11619abe9b96ee10bc3eac7cc25ac4418283f275 Mon Sep 17 00:00:00 2001
From: Ivan Kuten <ivan.kuten@promwad.com>
Date: Mon, 24 Nov 2008 15:17:54 -0500
Subject: [PATCH] --- yaml --- r: 122341 b: refs/heads/master c:
 860c6e6a15c5082e1a1ff1faeb56cdf439380e87 h: refs/heads/master i:   122339:
 df10d9832e47c27b03f2e21dbdadc43c37dd88f3 v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/wep.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 06892da836de..a86253685939 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b50563a68520dea3a19b5a8013c4ae0f8e3b49dd
+refs/heads/master: 860c6e6a15c5082e1a1ff1faeb56cdf439380e87
diff --git a/trunk/net/mac80211/wep.c b/trunk/net/mac80211/wep.c
index 7bbb98e846a3..7043ddc75498 100644
--- a/trunk/net/mac80211/wep.c
+++ b/trunk/net/mac80211/wep.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
+#include <asm/unaligned.h>
 
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
@@ -125,10 +126,10 @@ void ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
 {
 	struct blkcipher_desc desc = { .tfm = tfm };
 	struct scatterlist sg;
-	__le32 *icv;
+	__le32 icv;
 
-	icv = (__le32 *)(data + data_len);
-	*icv = cpu_to_le32(~crc32_le(~0, data, data_len));
+	icv = cpu_to_le32(~crc32_le(~0, data, data_len));
+	put_unaligned(icv, (__le32 *)(data + data_len));
 
 	crypto_blkcipher_setkey(tfm, rc4key, klen);
 	sg_init_one(&sg, data, data_len + WEP_ICV_LEN);