1 From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
2 Date: Fri, 19 Feb 2016 11:01:49 +0100
3 Subject: [PATCH] mac80211: add hdrlen to ieee80211_tx_data
5 Add hdrlen to ieee80211_tx_data and use this
6 when wep/ccmd/tkip. This is preparation for
9 Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
12 --- a/net/mac80211/ieee80211_i.h
13 +++ b/net/mac80211/ieee80211_i.h
14 @@ -173,6 +173,7 @@ struct ieee80211_tx_data {
15 struct ieee80211_tx_rate rate;
18 + unsigned int hdrlen;
22 --- a/net/mac80211/tx.c
23 +++ b/net/mac80211/tx.c
24 @@ -922,7 +922,7 @@ ieee80211_tx_h_fragment(struct ieee80211
25 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
26 struct ieee80211_hdr *hdr = (void *)skb->data;
27 int frag_threshold = tx->local->hw.wiphy->frag_threshold;
29 + int hdrlen = tx->hdrlen;
32 /* no matter what happens, tx->skb moves to tx->skbs */
33 @@ -943,8 +943,6 @@ ieee80211_tx_h_fragment(struct ieee80211
34 if (WARN_ON(info->flags & IEEE80211_TX_CTL_AMPDU))
37 - hdrlen = ieee80211_hdrlen(hdr->frame_control);
39 /* internal error, why isn't DONTFRAG set? */
40 if (WARN_ON(skb->len + FCS_LEN <= frag_threshold))
42 @@ -1176,6 +1174,8 @@ ieee80211_tx_prepare(struct ieee80211_su
44 hdr = (struct ieee80211_hdr *) skb->data;
46 + tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
51 --- a/net/mac80211/util.c
52 +++ b/net/mac80211/util.c
53 @@ -1226,6 +1226,7 @@ void ieee80211_send_auth(struct ieee8021
54 struct ieee80211_local *local = sdata->local;
56 struct ieee80211_mgmt *mgmt;
57 + unsigned int hdrlen;
60 /* 24 + 6 = header + auth_algo + auth_transaction + status_code */
61 @@ -1250,8 +1251,10 @@ void ieee80211_send_auth(struct ieee8021
62 memcpy(skb_put(skb, extra_len), extra, extra_len);
64 if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
65 + hdrlen = ieee80211_hdrlen(mgmt->frame_control);
66 mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
67 - err = ieee80211_wep_encrypt(local, skb, key, key_len, key_idx);
68 + err = ieee80211_wep_encrypt(local, skb, hdrlen, key,
73 --- a/net/mac80211/wep.c
74 +++ b/net/mac80211/wep.c
75 @@ -89,11 +89,11 @@ static void ieee80211_wep_get_iv(struct
77 static u8 *ieee80211_wep_add_iv(struct ieee80211_local *local,
79 + unsigned int hdrlen,
80 int keylen, int keyidx)
82 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
83 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
84 - unsigned int hdrlen;
87 hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
88 @@ -101,7 +101,6 @@ static u8 *ieee80211_wep_add_iv(struct i
89 if (WARN_ON(skb_headroom(skb) < IEEE80211_WEP_IV_LEN))
92 - hdrlen = ieee80211_hdrlen(hdr->frame_control);
93 newhdr = skb_push(skb, IEEE80211_WEP_IV_LEN);
94 memmove(newhdr, newhdr + IEEE80211_WEP_IV_LEN, hdrlen);
96 @@ -160,6 +159,7 @@ int ieee80211_wep_encrypt_data(struct cr
98 int ieee80211_wep_encrypt(struct ieee80211_local *local,
100 + unsigned int hdrlen,
101 const u8 *key, int keylen, int keyidx)
104 @@ -169,7 +169,7 @@ int ieee80211_wep_encrypt(struct ieee802
105 if (WARN_ON(skb_tailroom(skb) < IEEE80211_WEP_ICV_LEN))
108 - iv = ieee80211_wep_add_iv(local, skb, keylen, keyidx);
109 + iv = ieee80211_wep_add_iv(local, skb, hdrlen, keylen, keyidx);
113 @@ -306,13 +306,14 @@ static int wep_encrypt_skb(struct ieee80
114 struct ieee80211_key_conf *hw_key = info->control.hw_key;
117 - if (ieee80211_wep_encrypt(tx->local, skb, tx->key->conf.key,
118 + if (ieee80211_wep_encrypt(tx->local, skb, tx->hdrlen,
120 tx->key->conf.keylen,
121 tx->key->conf.keyidx))
123 } else if ((hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) ||
124 (hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) {
125 - if (!ieee80211_wep_add_iv(tx->local, skb,
126 + if (!ieee80211_wep_add_iv(tx->local, skb, tx->hdrlen,
127 tx->key->conf.keylen,
128 tx->key->conf.keyidx))
130 --- a/net/mac80211/wep.h
131 +++ b/net/mac80211/wep.h
132 @@ -22,6 +22,7 @@ int ieee80211_wep_encrypt_data(struct cr
133 size_t klen, u8 *data, size_t data_len);
134 int ieee80211_wep_encrypt(struct ieee80211_local *local,
136 + unsigned int hdrlen,
137 const u8 *key, int keylen, int keyidx);
138 int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
139 size_t klen, u8 *data, size_t data_len);
140 --- a/net/mac80211/wpa.c
141 +++ b/net/mac80211/wpa.c
142 @@ -43,7 +43,7 @@ ieee80211_tx_h_michael_mic_add(struct ie
143 skb->len < 24 || !ieee80211_is_data_present(hdr->frame_control))
146 - hdrlen = ieee80211_hdrlen(hdr->frame_control);
147 + hdrlen = tx->hdrlen;
148 if (skb->len < hdrlen)
151 @@ -186,7 +186,6 @@ mic_fail_no_key:
153 static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
155 - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
156 struct ieee80211_key *key = tx->key;
157 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
159 @@ -201,7 +200,7 @@ static int tkip_encrypt_skb(struct ieee8
163 - hdrlen = ieee80211_hdrlen(hdr->frame_control);
164 + hdrlen = tx->hdrlen;
165 len = skb->len - hdrlen;
167 if (info->control.hw_key)
168 @@ -418,7 +417,7 @@ static int ccmp_encrypt_skb(struct ieee8
172 - hdrlen = ieee80211_hdrlen(hdr->frame_control);
173 + hdrlen = tx->hdrlen;
174 len = skb->len - hdrlen;
176 if (info->control.hw_key)
177 @@ -651,7 +650,7 @@ static int gcmp_encrypt_skb(struct ieee8
181 - hdrlen = ieee80211_hdrlen(hdr->frame_control);
182 + hdrlen = tx->hdrlen;
183 len = skb->len - hdrlen;
185 if (info->control.hw_key)
186 @@ -791,7 +790,6 @@ static ieee80211_tx_result
187 ieee80211_crypto_cs_encrypt(struct ieee80211_tx_data *tx,
190 - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
191 struct ieee80211_key *key = tx->key;
192 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
194 @@ -807,8 +805,7 @@ ieee80211_crypto_cs_encrypt(struct ieee8
195 pskb_expand_head(skb, iv_len, 0, GFP_ATOMIC)))
198 - hdrlen = ieee80211_hdrlen(hdr->frame_control);
200 + hdrlen = tx->hdrlen;
201 pos = skb_push(skb, iv_len);
202 memmove(pos, pos + iv_len, hdrlen);