diff options
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_proc.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_proc.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c index ae7d3caf3dae..005ff25a405f 100644 --- a/drivers/net/wireless/hostap/hostap_proc.c +++ b/drivers/net/wireless/hostap/hostap_proc.c | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | #include <linux/types.h> | 3 | #include <linux/types.h> |
4 | #include <linux/proc_fs.h> | 4 | #include <linux/proc_fs.h> |
5 | #include <net/ieee80211_crypt.h> | 5 | #include <net/lib80211.h> |
6 | 6 | ||
7 | #include "hostap_wlan.h" | 7 | #include "hostap_wlan.h" |
8 | #include "hostap.h" | 8 | #include "hostap.h" |
@@ -36,9 +36,10 @@ static int prism2_debug_proc_read(char *page, char **start, off_t off, | |||
36 | p += sprintf(p, "dev_enabled=%d\n", local->dev_enabled); | 36 | p += sprintf(p, "dev_enabled=%d\n", local->dev_enabled); |
37 | p += sprintf(p, "sw_tick_stuck=%d\n", local->sw_tick_stuck); | 37 | p += sprintf(p, "sw_tick_stuck=%d\n", local->sw_tick_stuck); |
38 | for (i = 0; i < WEP_KEYS; i++) { | 38 | for (i = 0; i < WEP_KEYS; i++) { |
39 | if (local->crypt[i] && local->crypt[i]->ops) { | 39 | if (local->crypt_info.crypt[i] && |
40 | p += sprintf(p, "crypt[%d]=%s\n", | 40 | local->crypt_info.crypt[i]->ops) { |
41 | i, local->crypt[i]->ops->name); | 41 | p += sprintf(p, "crypt[%d]=%s\n", i, |
42 | local->crypt_info.crypt[i]->ops->name); | ||
42 | } | 43 | } |
43 | } | 44 | } |
44 | p += sprintf(p, "pri_only=%d\n", local->pri_only); | 45 | 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, | |||
206 | return 0; | 207 | return 0; |
207 | } | 208 | } |
208 | 209 | ||
209 | p += sprintf(p, "tx_keyidx=%d\n", local->tx_keyidx); | 210 | p += sprintf(p, "tx_keyidx=%d\n", local->crypt_info.tx_keyidx); |
210 | for (i = 0; i < WEP_KEYS; i++) { | 211 | for (i = 0; i < WEP_KEYS; i++) { |
211 | if (local->crypt[i] && local->crypt[i]->ops && | 212 | if (local->crypt_info.crypt[i] && |
212 | local->crypt[i]->ops->print_stats) { | 213 | local->crypt_info.crypt[i]->ops && |
213 | p = local->crypt[i]->ops->print_stats( | 214 | local->crypt_info.crypt[i]->ops->print_stats) { |
214 | p, local->crypt[i]->priv); | 215 | p = local->crypt_info.crypt[i]->ops->print_stats( |
216 | p, local->crypt_info.crypt[i]->priv); | ||
215 | } | 217 | } |
216 | } | 218 | } |
217 | 219 | ||