aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/wpa.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-06-11 17:22:00 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-14 12:18:13 -0400
commitc801242c38de247d82f12f6bf28bd19a280a12ae (patch)
tree7ad4a20083f24b433e36ab28bda09ea87f499bdc /net/mac80211/wpa.c
parent87228f57434108d8463ff10fd408d8d1273a23d2 (diff)
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.c8
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)
198 key->u.tkip.tx.iv32++; 198 key->u.tkip.tx.iv32++;
199 199
200 if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) { 200 if (tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
201 hdr = (struct ieee80211_hdr *)skb->data;
202
203 /* hwaccel - with preallocated room for IV */ 201 /* hwaccel - with preallocated room for IV */
204 ieee80211_tkip_add_iv(pos, key, 202 ieee80211_tkip_add_iv(pos, key, key->u.tkip.tx.iv16);
205 (u8) (key->u.tkip.tx.iv16 >> 8),
206 (u8) (((key->u.tkip.tx.iv16 >> 8) | 0x20) &
207 0x7f),
208 (u8) key->u.tkip.tx.iv16);
209 203
210 info->control.hw_key = &tx->key->conf; 204 info->control.hw_key = &tx->key->conf;
211 return 0; 205 return 0;