[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, 5 insertions, 4 deletions

diff --git a/drivers/net/wireless/hostap/hostap_ap.h b/drivers/net/wireless/hostap/hostap_ap.h
index 10137f44436..137f78e4532 100644
--- a/drivers/net/wireless/hostap/hostap_ap.h
+++ b/drivers/net/wireless/hostap/hostap_ap.h
@@ -81,7 +81,7 @@ struct sta_info {
         u32 tx_since_last_failure;
         u32 tx_consecutive_exc;
 
-        struct prism2_crypt_data *crypt;
+        struct ieee80211_crypt_data *crypt;
 
         int ap; /* whether this station is an AP */
 
@@ -216,7 +216,7 @@ struct ap_data {
 
         /* WEP operations for generating challenges to be used with shared key
          * authentication */
-        struct hostap_crypto_ops *crypt;
+        struct ieee80211_crypto_ops *crypt;
         void *crypt_priv;
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
 };
@@ -236,7 +236,7 @@ typedef enum {
 struct hostap_tx_data {
         struct sk_buff *skb;
         int host_encrypt;
-        struct prism2_crypt_data *crypt;
+        struct ieee80211_crypt_data *crypt;
         void *sta_ptr;
 };
 ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx);
@@ -253,7 +253,8 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
                                int wds);
 int hostap_handle_sta_crypto(local_info_t *local,
                              struct hostap_ieee80211_hdr *hdr,
-                             struct prism2_crypt_data **crypt, void **sta_ptr);
+                             struct ieee80211_crypt_data **crypt,
+                             void **sta_ptr);
 int hostap_is_sta_assoc(struct ap_data *ap, u8 *sta_addr);
 int hostap_is_sta_authorized(struct ap_data *ap, u8 *sta_addr);
 int hostap_add_sta(struct ap_data *ap, u8 *sta_addr);