summaryrefslogtreecommitdiff
path: root/net/mac80211/wpa.h
diff options
context:
space:
mode:
authorYoni Divinsky <yoni.divinsky@ti.com>2012-01-16 15:18:59 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-01-16 15:01:16 -0500
commitd32a102819eef99d4d87019266bea208447be0a0 (patch)
treeff6484ac0f843dc48c24db2604bfbef1424967e0 /net/mac80211/wpa.h
parent331d9301ed4d0fe33e9762c62f2870243bcf77eb (diff)
downloadlinux-3.10-d32a102819eef99d4d87019266bea208447be0a0.tar.gz
linux-3.10-d32a102819eef99d4d87019266bea208447be0a0.tar.bz2
linux-3.10-d32a102819eef99d4d87019266bea208447be0a0.zip
mac80211: fix tx->skb NULL pointer dereference
In function ieee80211_tx_h_encrypt the var info was initialized from tx->skb, since the fucntion is called after the function ieee80211_tx_h_fragment tx->skb is not valid anymore. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wpa.h')
-rw-r--r--net/mac80211/wpa.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/wpa.h b/net/mac80211/wpa.h
index baba0608313..07e33f899c7 100644
--- a/net/mac80211/wpa.h
+++ b/net/mac80211/wpa.h
@@ -32,5 +32,7 @@ ieee80211_tx_result
ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx);
ieee80211_rx_result
ieee80211_crypto_aes_cmac_decrypt(struct ieee80211_rx_data *rx);
+ieee80211_tx_result
+ieee80211_crypto_hw_encrypt(struct ieee80211_tx_data *tx);
#endif /* WPA_H */