---

yaml --- r: 95869 b: refs/heads/master c: 17f8304 h: refs/heads/master i: 95867: 8e2b3c6 v: v3
git-mirror · May 1, 2008 · 3f27ed1 · 3f27ed1
1 parent eb98be0
commit 3f27ed1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 636c5d488bc0b349e01cf5bfbf85588134af70a0
+refs/heads/master: 17f830459d6116ae13dbcfc9d09a406e6717b1a6
diff --git a/trunk/net/mac80211/tkip.c b/trunk/net/mac80211/tkip.c
@@ -230,10 +230,8 @@ void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
 
 	iv16 = data[hdr_len] << 8;
 	iv16 += data[hdr_len + 2];
-	iv32 = data[hdr_len + 4] +
-		(data[hdr_len + 5] >> 8) +
-		(data[hdr_len + 6] >> 16) +
-		(data[hdr_len + 7] >> 24);
+	iv32 = data[hdr_len + 4] | (data[hdr_len + 5] << 8) |
+	       (data[hdr_len + 6] << 16) | (data[hdr_len + 7] << 24);
 
 #ifdef CONFIG_TKIP_DEBUG
 	printk(KERN_DEBUG "TKIP encrypt: iv16 = 0x%04x, iv32 = 0x%08x\n",