Commit 7863157d authored by Arik Nemtsov's avatar Arik Nemtsov Committed by John W. Linville
Browse files

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: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ac55d2fe

net/mac80211/wep.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

}

net/mac80211/wpa.c

+2 −0
Original line number Diff line number Diff line
@@ -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 &&