summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/hostap/hostap_wlan.h
diff options
context:
space:
mode:
authorJouni Malinen <jkmaline@cc.hut.fi>2005-07-31 07:43:20 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-07-31 08:28:02 +0400
commit62fe7e378109537ff80971c5208e12d40bf88bee (patch)
tree6facd4654afbef6590e21c4fde0c71fb7ed79f2e /drivers/net/wireless/hostap/hostap_wlan.h
parentebed67d2847a9d299b47eeb5d82744671ab2b198 (diff)
downloadlinux-62fe7e378109537ff80971c5208e12d40bf88bee.tar.xz
[PATCH] hostap: Replace crypto code with net/ieee80211 version
Replace Host AP version of WEP, TKIP, CCMP implementation with net/ieee80211 that has more or less identical implementation (since it is based on the Host AP implementation). Remove Host AP specific implementation and modules from drivers/net/wireless/hostap. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_wlan.h')
-rw-r--r--drivers/net/wireless/hostap/hostap_wlan.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index f215a22e8fee..a632d45f334d 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -2,7 +2,6 @@
#define HOSTAP_WLAN_H
#include "hostap_config.h"
-#include "hostap_crypt.h"
#include "hostap_common.h"
#define MAX_PARM_DEVICES 8
@@ -534,13 +533,6 @@ struct prism2_frag_entry {
};
-struct prism2_crypt_data {
- struct list_head list; /* delayed deletion list */
- struct hostap_crypto_ops *ops;
- void *priv;
- atomic_t refcnt;
-};
-
struct hostap_cmd_queue {
struct list_head list;
wait_queue_head_t compl;
@@ -765,7 +757,7 @@ struct local_info {
#define WEP_KEYS 4
#define WEP_KEY_LEN 13
- struct prism2_crypt_data *crypt[WEP_KEYS];
+ struct ieee80211_crypt_data *crypt[WEP_KEYS];
int tx_keyidx; /* default TX key index (crypt[tx_keyidx]) */
struct timer_list crypt_deinit_timer;
struct list_head crypt_deinit_list;