Staging: wlan-ng: Eliminate more <2.6 kernel support.

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / hostap / hostap_proc.c

diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index ae7d3caf3dae852b43b91ef77f784d7d6c0b7e60..005ff25a405f2bfde34adf66d4e9e85f85c44f2a 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -2,7 +2,7 @@
 
 #include <linux/types.h>
 #include <linux/proc_fs.h>
-#include <net/ieee80211_crypt.h>
+#include <net/lib80211.h>
 
 #include "hostap_wlan.h"
 #include "hostap.h"
@@ -36,9 +36,10 @@ static int prism2_debug_proc_read(char *page, char **start, off_t off,
        p += sprintf(p, "dev_enabled=%d\n", local->dev_enabled);
        p += sprintf(p, "sw_tick_stuck=%d\n", local->sw_tick_stuck);
        for (i = 0; i < WEP_KEYS; i++) {
-               if (local->crypt[i] && local->crypt[i]->ops) {
-                       p += sprintf(p, "crypt[%d]=%s\n",
-                                    i, local->crypt[i]->ops->name);
+               if (local->crypt_info.crypt[i] &&
+                   local->crypt_info.crypt[i]->ops) {
+                       p += sprintf(p, "crypt[%d]=%s\n", i,
+                                    local->crypt_info.crypt[i]->ops->name);
                }
        }
        p += sprintf(p, "pri_only=%d\n", local->pri_only);
@@ -206,12 +207,13 @@ static int prism2_crypt_proc_read(char *page, char **start, off_t off,
                return 0;
        }
 
-       p += sprintf(p, "tx_keyidx=%d\n", local->tx_keyidx);
+       p += sprintf(p, "tx_keyidx=%d\n", local->crypt_info.tx_keyidx);
        for (i = 0; i < WEP_KEYS; i++) {
-               if (local->crypt[i] && local->crypt[i]->ops &&
-                   local->crypt[i]->ops->print_stats) {
-                       p = local->crypt[i]->ops->print_stats(
-                               p, local->crypt[i]->priv);
+               if (local->crypt_info.crypt[i] &&
+                   local->crypt_info.crypt[i]->ops &&
+                   local->crypt_info.crypt[i]->ops->print_stats) {
+                       p = local->crypt_info.crypt[i]->ops->print_stats(
+                               p, local->crypt_info.crypt[i]->priv);
                }
        }