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/wep.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/wep.h')
-rw-r--r-- | net/mac80211/wep.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wep.h b/net/mac80211/wep.h index 785fbb4e0dd..43aef50cd0d 100644 --- a/net/mac80211/wep.h +++ b/net/mac80211/wep.h @@ -28,9 +28,9 @@ int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb, struct ieee80211_key *key); u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key); -ieee80211_txrx_result +ieee80211_rx_result ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx); -ieee80211_txrx_result +ieee80211_tx_result ieee80211_crypto_wep_encrypt(struct ieee80211_txrx_data *tx); #endif /* WEP_H */ |