don't use net/ieee80211.h

Convert all the drivers using net/ieee80211.h to use linux/ieee80211.h.
Contains a bugfix in libertas where the SSID parsing could overrun the
buffer when the AP sends invalid information.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Dan Williams <dcbw@redhat.com> [airo, libertas]
Acked-by: Pavel Roskin <proski@gnu.org> [orinoco]
Acked-by: David Kilroy <kilroyd@googlemail.com> [orinoco]
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index d10dc3ea9c79..ec2314246682 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -30,10 +30,11 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/wireless.h>
+#include <linux/ieee80211.h>
+#include <linux/if_arp.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <net/iw_handler.h>
-#include <net/ieee80211.h>
 
 #include <linux/dma-mapping.h>
 #include <net/checksum.h>
@@ -449,9 +450,9 @@ static size_t gelic_wl_synthesize_ie(u8 *buf,
 
         /* element id */
         if (rsn)
-                *buf++ = MFIE_TYPE_RSN;
+                *buf++ = WLAN_EID_RSN;
         else
-                *buf++ = MFIE_TYPE_GENERIC;
+                *buf++ = WLAN_EID_GENERIC;
 
         /* length filed; set later */
         buf++;
@@ -539,7 +540,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
                         break;
 
                 switch (item_id) {
-                case MFIE_TYPE_GENERIC:
+                case WLAN_EID_GENERIC:
                         if ((OUI_LEN + 1 <= item_len) &&
                             !memcmp(pos, wpa_oui, OUI_LEN) &&
                             pos[OUI_LEN] == 0x01) {
@@ -547,7 +548,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
                                 ie_info->wpa.len = item_len + 2;
                         }
                         break;
-                case MFIE_TYPE_RSN:
+                case WLAN_EID_RSN:
                         ie_info->rsn.data = pos - 2;
                         /* length includes the header */
                         ie_info->rsn.len = item_len + 2;
@@ -581,7 +582,7 @@ static char *gelic_wl_translate_scan(struct net_device *netdev,
         char *tmp;
         u8 rate;
         unsigned int i, j, len;
-        u8 buf[MAX_WPA_IE_LEN];
+        u8 buf[64]; /* arbitrary size large enough */
 
         pr_debug("%s: <-\n", __func__);
 
@@ -1734,14 +1735,14 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
                 target->essid_len = strnlen(scan_info->essid,
                                             sizeof(scan_info->essid));
                 target->rate_len = 0;
-                for (r = 0; r < MAX_RATES_LENGTH; r++)
+                for (r = 0; r < 12; r++)
                         if (scan_info->rate[r])
                                 target->rate_len++;
                 if (8 < target->rate_len)
                         pr_info("%s: AP returns %d rates\n", __func__,
                                 target->rate_len);
                 target->rate_ext_len = 0;
-                for (r = 0; r < MAX_RATES_EX_LENGTH; r++)
+                for (r = 0; r < 16; r++)
                         if (scan_info->ext_rate[r])
                                 target->rate_ext_len++;
                 list_move_tail(&target->list, &wl->network_list);