diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-01 02:06:32 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-01 02:06:32 -0700 |
commit | c2a3b233450d5bc426c063ea2d8a74351db29ea4 (patch) | |
tree | 3912c49e941b62ba20a4a7ed0b1b14c97f19ff32 /net/mac80211/tkip.c | |
parent | e4c576b911e364737b1bf4f5bfdab1c440713f26 (diff) | |
parent | c0d43990768b6ca83604ff4be80425b89d317e2f (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/tkip.c')
-rw-r--r-- | net/mac80211/tkip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c index dddbfd60f35..09093da24af 100644 --- a/net/mac80211/tkip.c +++ b/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", |