summaryrefslogtreecommitdiffstats
path: root/net/mac80211/wpa.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-26 15:19:40 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:53:13 -0700
commit4f0d18e26f8bc4c6507b69aa0080d0fae807c990 (patch)
treeb9ef529b35cec6a81b8b7868c80088a30aa6bc9d /net/mac80211/wpa.h
parentb2e7771e556917cc301a3308561f49b2b2272c07 (diff)
downloadop-kernel-dev-4f0d18e26f8bc4c6507b69aa0080d0fae807c990.zip
op-kernel-dev-4f0d18e26f8bc4c6507b69aa0080d0fae807c990.tar.gz
[PATCH] mac80211: consolidate decryption
Currently, we run through all three crypto algorithms for each received frame even though we have previously determined which key we have and as such already know which algorithm will be used. Change it to invoke only the needed function. Also move the WEP decrypt handler to wep.c so that fewer functions need to be non-static. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wpa.h')
-rw-r--r--net/mac80211/wpa.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wpa.h b/net/mac80211/wpa.h
index da3b959..e49946f 100644
--- a/net/mac80211/wpa.h
+++ b/net/mac80211/wpa.h
@@ -21,11 +21,11 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx);
ieee80211_txrx_result
ieee80211_tx_h_tkip_encrypt(struct ieee80211_txrx_data *tx);
ieee80211_txrx_result
-ieee80211_rx_h_tkip_decrypt(struct ieee80211_txrx_data *rx);
+ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx);
ieee80211_txrx_result
ieee80211_tx_h_ccmp_encrypt(struct ieee80211_txrx_data *tx);
ieee80211_txrx_result
-ieee80211_rx_h_ccmp_decrypt(struct ieee80211_txrx_data *rx);
+ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx);
#endif /* WPA_H */
OpenPOWER on IntegriCloud