diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-06-11 23:22:00 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-06-14 18:18:13 +0200 |
| commit | c801242c38de247d82f12f6bf28bd19a280a12ae (patch) | |
| tree | 7ad4a20083f24b433e36ab28bda09ea87f499bdc /net/mac80211/wpa.c | |
| parent | mac80211: rx.c use new helpers (diff) | |
| download | linux-c801242c38de247d82f12f6bf28bd19a280a12ae.tar.xz linux-c801242c38de247d82f12f6bf28bd19a280a12ae.zip | |
mac80211: tkip.c consolidate tkip IV writing in helper
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wpa.c')
| -rw-r--r-- | net/mac80211/wpa.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index 9834cecaca35..345e10e9b313 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -198,14 +198,8 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb) key->u.tkip.tx.iv32++; if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) { - hdr = (struct ieee80211_hdr *)skb->data; - /* hwaccel - with preallocated room for IV */ - ieee80211_tkip_add_iv(pos, key, - (u8) (key->u.tkip.tx.iv16 >> 8), - (u8) (((key->u.tkip.tx.iv16 >> 8) | 0x20) & - 0x7f), - (u8) key->u.tkip.tx.iv16); + ieee80211_tkip_add_iv(pos, key, key->u.tkip.tx.iv16); info->control.hw_key = &tx->key->conf; return 0; |