Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.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 81b321b..d1d8ce0 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -1,5 +1,12 @@
 /* /proc routines for Host AP driver */
 
+#include <linux/types.h>
+#include <linux/proc_fs.h>
+#include <net/ieee80211_crypt.h>
+
+#include "hostap_wlan.h"
+#include "hostap.h"
+
 #define PROC_LIMIT (PAGE_SIZE - 80)
 
 
@@ -302,20 +309,15 @@ static int prism2_scan_results_proc_read(char *page, char **start, off_t off,
 {
        char *p = page;
        local_info_t *local = (local_info_t *) data;
-       int entries, entry, i, len, total = 0, hostscan;
-       struct hfa384x_scan_result *scanres;
-       struct hfa384x_hostscan_result *hscanres;
+       int entry, i, len, total = 0;
+       struct hfa384x_hostscan_result *scanres;
        u8 *pos;
 
        p += sprintf(p, "CHID ANL SL BcnInt Capab Rate BSSID ATIM SupRates "
                     "SSID\n");
 
        spin_lock_bh(&local->lock);
-       hostscan = local->last_scan_type == PRISM2_HOSTSCAN;
-       entries = hostscan ? local->last_hostscan_results_count :
-               local->last_scan_results_count;
-       for (entry = 0; entry < entries; entry++) {
-               hscanres = &local->last_hostscan_results[entry];
+       for (entry = 0; entry < local->last_scan_results_count; entry++) {
                scanres = &local->last_scan_results[entry];
 
                if (total + (p - page) <= off) {
@@ -327,39 +329,26 @@ static int prism2_scan_results_proc_read(char *page, char **start, off_t off,
                if ((p - page) > (PAGE_SIZE - 200))
                        break;
 
-               if (hostscan) {
-                       p += sprintf(p, "%d %d %d %d 0x%02x %d " MACSTR " %d ",
-                                    le16_to_cpu(hscanres->chid),
-                                    (s16) le16_to_cpu(hscanres->anl),
-                                    (s16) le16_to_cpu(hscanres->sl),
-                                    le16_to_cpu(hscanres->beacon_interval),
-                                    le16_to_cpu(hscanres->capability),
-                                    le16_to_cpu(hscanres->rate),
-                                    MAC2STR(hscanres->bssid),
-                                    le16_to_cpu(hscanres->atim));
-               } else {
-                       p += sprintf(p, "%d %d %d %d 0x%02x %d " MACSTR
-                                    " N/A ",
-                                    le16_to_cpu(scanres->chid),
-                                    (s16) le16_to_cpu(scanres->anl),
-                                    (s16) le16_to_cpu(scanres->sl),
-                                    le16_to_cpu(scanres->beacon_interval),
-                                    le16_to_cpu(scanres->capability),
-                                    le16_to_cpu(scanres->rate),
-                                    MAC2STR(scanres->bssid));
-               }
-
-               pos = hostscan ? hscanres->sup_rates : scanres->sup_rates;
-               for (i = 0; i < sizeof(hscanres->sup_rates); i++) {
+               p += sprintf(p, "%d %d %d %d 0x%02x %d " MACSTR " %d ",
+                            le16_to_cpu(scanres->chid),
+                            (s16) le16_to_cpu(scanres->anl),
+                            (s16) le16_to_cpu(scanres->sl),
+                            le16_to_cpu(scanres->beacon_interval),
+                            le16_to_cpu(scanres->capability),
+                            le16_to_cpu(scanres->rate),
+                            MAC2STR(scanres->bssid),
+                            le16_to_cpu(scanres->atim));
+
+               pos = scanres->sup_rates;
+               for (i = 0; i < sizeof(scanres->sup_rates); i++) {
                        if (pos[i] == 0)
                                break;
                        p += sprintf(p, "<%02x>", pos[i]);
                }
                p += sprintf(p, " ");
 
-               pos = hostscan ? hscanres->ssid : scanres->ssid;
-               len = le16_to_cpu(hostscan ? hscanres->ssid_len :
-                                 scanres->ssid_len);
+               pos = scanres->ssid;
+               len = le16_to_cpu(scanres->ssid_len);
                if (len > 32)
                        len = 32;
                for (i = 0; i < len; i++) {