diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-26 09:19:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:53:14 -0400 |
| commit | 6a22a59d487e7fe509b457b72497593e402911c0 (patch) | |
| tree | a4bfd02cdea7e1cec690101bc119b515f3dc445c /net/mac80211/wpa.h | |
| parent | 4f0d18e26f8bc4c6507b69aa0080d0fae807c990 (diff) | |
[PATCH] mac80211: consolidate encryption
Currently we run through all crypto handlers for each transmitted
frame although we already know which one will be used. This
changes the code to invoke only the needed handler. It also moves
the wep code into wep.c.
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wpa.h b/net/mac80211/wpa.h index e49946f54623..49d80cf0cd75 100644 --- a/net/mac80211/wpa.h +++ b/net/mac80211/wpa.h | |||
| @@ -19,12 +19,12 @@ ieee80211_txrx_result | |||
| 19 | ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx); | 19 | ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx); |
| 20 | 20 | ||
| 21 | ieee80211_txrx_result | 21 | ieee80211_txrx_result |
| 22 | ieee80211_tx_h_tkip_encrypt(struct ieee80211_txrx_data *tx); | 22 | ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx); |
| 23 | ieee80211_txrx_result | 23 | ieee80211_txrx_result |
| 24 | ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx); | 24 | ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx); |
| 25 | 25 | ||
| 26 | ieee80211_txrx_result | 26 | ieee80211_txrx_result |
| 27 | ieee80211_tx_h_ccmp_encrypt(struct ieee80211_txrx_data *tx); | 27 | ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx); |
| 28 | ieee80211_txrx_result | 28 | ieee80211_txrx_result |
| 29 | ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx); | 29 | ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx); |
| 30 | 30 | ||