From 3f27ed15ffd54d7262b9a4ae34f397149e598396 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Sun, 27 Apr 2008 03:48:40 -0700 Subject: [PATCH] --- yaml --- r: 95869 b: refs/heads/master c: 17f830459d6116ae13dbcfc9d09a406e6717b1a6 h: refs/heads/master i: 95867: 8e2b3c69332db2b539137059abaae95e06410ffe v: v3 --- [refs] | 2 +- trunk/net/mac80211/tkip.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1cf820f02ec0..f67b325875a4 100644 --- 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 index dddbfd60f351..09093da24af6 100644 --- 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",