diff options
| author | Arik Nemtsov <arik@wizery.com> | 2012-05-10 13:21:09 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 12:47:43 -0400 |
| commit | 7863157d83763a0f1b9ad96c94a1ed3d0372526a (patch) | |
| tree | 05b5802a68f5c945abf3c2c8a105ed6a1a01741a /net | |
| parent | ac55d2fe0576d272c4a98ed9dfb87b1cca29486e (diff) | |
| download | linux-stable-7863157d83763a0f1b9ad96c94a1ed3d0372526a.tar.gz linux-stable-7863157d83763a0f1b9ad96c94a1ed3d0372526a.tar.bz2 linux-stable-7863157d83763a0f1b9ad96c94a1ed3d0372526a.zip | |
mac80211: fix network header location when adding encryption headers
Update the location of the network header when adding encryption
specific headers to a skb. This allows low-level drivers to use the
(now correct) location of the network header.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/wep.c | 1 | ||||
| -rw-r--r-- | net/mac80211/wpa.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c index e904401684da..c04d401dae92 100644 --- a/net/mac80211/wep.c +++ b/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/net/mac80211/wpa.c b/net/mac80211/wpa.c index 4d05ad9403ae..bdb53aba888e 100644 --- a/net/mac80211/wpa.c +++ b/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 && |