lib80211: Cosmetics - make room for MIC/CRC near the actual calculation
PATCH 1/1 lib80211: Cosmetics - make room for MIC/CRC near the actual calculation
--- net/wireless/lib80211_crypt_ccmp.c | 2 +- net/wireless/lib80211_crypt_tkip.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-)
(quoted diff) +0 -0
b/net/wireless/lib80211_crypt_ccmp.c
index 2301dc1..b7fa31d 100644
net/wireless/lib80211_crypt_ccmp.c +0 -0
@@ -237,7 +237,6 @@ static int lib80211_ccmp_encrypt(struct sk_buff
*skb, int hdr_len, void *priv)
return -1;
pos = skb->data + hdr_len + CCMP_HDR_LEN;
- mic = skb_put(skb, CCMP_MIC_LEN);
hdr = (struct ieee80211_hdr *)skb->data; ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
@@ -257,6 +256,7 @@ static int lib80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
pos += len;
}
+ mic = skb_put(skb, CCMP_MIC_LEN);
for (i = 0; i < CCMP_MIC_LEN; i++)
mic[i] = b[i] ^ s0[i];
(quoted diff) +0 -0
b/net/wireless/lib80211_crypt_tkip.c
index c362873..7d9254c 100644
net/wireless/lib80211_crypt_tkip.c +0 -0
@@ -384,9 +384,8 @@ static int lib80211_tkip_encrypt(struct sk_buff
*skb, int hdr_len, void *priv)
if ((lib80211_tkip_hdr(skb, hdr_len, rc4key, 16, priv)) < 0)
return -1;
- icv = skb_put(skb, 4);
-
crc = ~crc32_le(~0, pos, len);
+ icv = skb_put(skb, 4);
icv[0] = crc;
icv[1] = crc >> 8;
icv[2] = crc >> 16;