diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-29 13:41:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-29 13:41:25 -0800 |
| commit | 4a80f2788952055a627f2093a0174537d70aec1b (patch) | |
| tree | 411c8ec555fe85cf9faa9da90e62ab781b33661c /net/mac80211/wpa.h | |
| parent | 03a64c93b68e1eff299b9bbbb0d13105171cddc4 (diff) | |
| parent | e4861829072c61883114c64a3af61f305a789ff0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'net/mac80211/wpa.h')
| -rw-r--r-- | net/mac80211/wpa.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/wpa.h b/net/mac80211/wpa.h index 49d80cf0cd7..16e4dba4aa7 100644 --- a/net/mac80211/wpa.h +++ b/net/mac80211/wpa.h @@ -13,19 +13,19 @@ #include <linux/types.h> #include "ieee80211_i.h" -ieee80211_txrx_result +ieee80211_tx_result ieee80211_tx_h_michael_mic_add(struct ieee80211_txrx_data *tx); -ieee80211_txrx_result +ieee80211_rx_result ieee80211_rx_h_michael_mic_verify(struct ieee80211_txrx_data *rx); -ieee80211_txrx_result +ieee80211_tx_result ieee80211_crypto_tkip_encrypt(struct ieee80211_txrx_data *tx); -ieee80211_txrx_result +ieee80211_rx_result ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx); -ieee80211_txrx_result +ieee80211_tx_result ieee80211_crypto_ccmp_encrypt(struct ieee80211_txrx_data *tx); -ieee80211_txrx_result +ieee80211_rx_result ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx); #endif /* WPA_H */ |