[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>

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;