aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/wpa.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/wpa.c')
-rw-r--r--net/mac80211/wpa.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 20cec1cb956f..6f04311cf0a0 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -245,16 +245,9 @@ static int tkip_encrypt_skb(struct ieee80211_txrx_data *tx,
245ieee80211_txrx_result 245ieee80211_txrx_result
246ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx) 246ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx)
247{ 247{
248 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
249 u16 fc;
250 struct sk_buff *skb = tx->skb; 248 struct sk_buff *skb = tx->skb;
251 int wpa_test = 0, test = 0; 249 int wpa_test = 0, test = 0;
252 250
253 fc = le16_to_cpu(hdr->frame_control);
254
255 if (!WLAN_FC_DATA_PRESENT(fc))
256 return TXRX_CONTINUE;
257
258 tx->u.tx.control->icv_len = TKIP_ICV_LEN; 251 tx->u.tx.control->icv_len = TKIP_ICV_LEN;
259 tx->u.tx.control->iv_len = TKIP_IV_LEN; 252 tx->u.tx.control->iv_len = TKIP_IV_LEN;
260 ieee80211_tx_set_iswep(tx); 253 ieee80211_tx_set_iswep(tx);
@@ -501,16 +494,9 @@ static int ccmp_encrypt_skb(struct ieee80211_txrx_data *tx,
501ieee80211_txrx_result 494ieee80211_txrx_result
502ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx) 495ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx)
503{ 496{
504 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
505 u16 fc;
506 struct sk_buff *skb = tx->skb; 497 struct sk_buff *skb = tx->skb;
507 int test = 0; 498 int test = 0;
508 499
509 fc = le16_to_cpu(hdr->frame_control);
510
511 if (!WLAN_FC_DATA_PRESENT(fc))
512 return TXRX_CONTINUE;
513
514 tx->u.tx.control->icv_len = CCMP_MIC_LEN; 500 tx->u.tx.control->icv_len = CCMP_MIC_LEN;
515 tx->u.tx.control->iv_len = CCMP_HDR_LEN; 501 tx->u.tx.control->iv_len = CCMP_HDR_LEN;
516 ieee80211_tx_set_iswep(tx); 502 ieee80211_tx_set_iswep(tx);