From 4e67026a87dbde17a4276a39bc0a71399dde2b3e Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Thu, 10 May 2012 13:21:09 +0300 Subject: [PATCH] --- yaml --- r: 306809 b: refs/heads/master c: 7863157d83763a0f1b9ad96c94a1ed3d0372526a h: refs/heads/master i: 306807: 76a4f60bec501a25ab5af8dda92befe134da1fbc v: v3 --- [refs] | 2 +- trunk/net/mac80211/wep.c | 1 + trunk/net/mac80211/wpa.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2aa0d010eed1..91247ec861e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac55d2fe0576d272c4a98ed9dfb87b1cca29486e +refs/heads/master: 7863157d83763a0f1b9ad96c94a1ed3d0372526a diff --git a/trunk/net/mac80211/wep.c b/trunk/net/mac80211/wep.c index e904401684da..c04d401dae92 100644 --- a/trunk/net/mac80211/wep.c +++ b/trunk/net/mac80211/wep.c @@ -111,6 +111,7 @@ static u8 *ieee80211_wep_add_iv(struct ieee80211_local *local, (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) return newhdr + hdrlen; + skb_set_network_header(skb, skb_network_offset(skb) + WEP_IV_LEN); ieee80211_wep_get_iv(local, keylen, keyidx, newhdr + hdrlen); return newhdr + hdrlen; } diff --git a/trunk/net/mac80211/wpa.c b/trunk/net/mac80211/wpa.c index 4d05ad9403ae..bdb53aba888e 100644 --- a/trunk/net/mac80211/wpa.c +++ b/trunk/net/mac80211/wpa.c @@ -203,6 +203,7 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb) pos = skb_push(skb, TKIP_IV_LEN); memmove(pos, pos + TKIP_IV_LEN, hdrlen); + skb_set_network_header(skb, skb_network_offset(skb) + TKIP_IV_LEN); pos += hdrlen; /* the HW only needs room for the IV, but not the actual IV */ @@ -428,6 +429,7 @@ static int ccmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb) pos = skb_push(skb, CCMP_HDR_LEN); memmove(pos, pos + CCMP_HDR_LEN, hdrlen); + skb_set_network_header(skb, skb_network_offset(skb) + CCMP_HDR_LEN); /* the HW only needs room for the IV, but not the actual IV */ if (info->control.hw_key &&