wl12xx: remove wext dependencies

This driver uses IW_ESSID_MAX_SIZE when it should
be using IEEE80211_MAX_SSID_LEN instead.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/cmd.h b/drivers/net/wireless/wl12xx/cmd.h
index 1f7037292c15785b50e033f75d2ede5cad77adb4..bba077ecd945f2bb0629752ec38364c162c6381c 100644 (file)
--- a/drivers/net/wireless/wl12xx/cmd.h
+++ b/drivers/net/wireless/wl12xx/cmd.h
@@ -239,7 +239,7 @@ struct wl1271_cmd_join {
        u8 bss_type;
        u8 channel;
        u8 ssid_len;
-       u8 ssid[IW_ESSID_MAX_SIZE];
+       u8 ssid[IEEE80211_MAX_SSID_LEN];
        u8 ctrl; /* JOIN_CMD_CTRL_* */
        u8 reserved[3];
 } __packed;
@@ -528,7 +528,7 @@ struct wl1271_cmd_bss_start {
        /* wl1271_ssid_type */
        u8 ssid_type;
        u8 ssid_len;
-       u8 ssid[IW_ESSID_MAX_SIZE];
+       u8 ssid[IEEE80211_MAX_SSID_LEN];
        u8 padding_1[2];
 
        /* Basic rate set */

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index e58c22d21e39af9d8683ff94e1ccee929258902c..3418299e17c853d5e291f5a419aeb9951e592dd5 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1997,7 +1997,7 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
        wl1271_power_off(wl);
 
        memset(wl->bssid, 0, ETH_ALEN);
-       memset(wl->ssid, 0, IW_ESSID_MAX_SIZE + 1);
+       memset(wl->ssid, 0, IEEE80211_MAX_SSID_LEN + 1);
        wl->ssid_len = 0;
        wl->bss_type = MAX_BSS_TYPE;
        wl->set_bss_type = MAX_BSS_TYPE;

diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/wl12xx/scan.h
index d882e4da71b705e87a0b47af18969239ac1f87f7..0b2a2987439d40afce9c4a69ba12c9d95e745184 100644 (file)
--- a/drivers/net/wireless/wl12xx/scan.h
+++ b/drivers/net/wireless/wl12xx/scan.h
@@ -77,7 +77,7 @@ struct basic_scan_params {
        u8 ssid_len;
        /* in order to align */
        u8 padding1[2];
-       u8 ssid[IW_ESSID_MAX_SIZE];
+       u8 ssid[IEEE80211_MAX_SSID_LEN];
        /* Band to scan */
        u8 band;
        u8 use_ssid_list;
@@ -167,7 +167,7 @@ struct wl1271_cmd_sched_scan_config {
        u8 filter_type;
 
        u8 ssid_len;     /* For SCAN_SSID_FILTER_SPECIFIC */
-       u8 ssid[IW_ESSID_MAX_SIZE];
+       u8 ssid[IEEE80211_MAX_SSID_LEN];
 
        u8 n_probe_reqs; /* Number of probes requests per channel */
 
@@ -194,7 +194,7 @@ enum {
 struct wl1271_ssid {
        u8 type;
        u8 len;
-       u8 ssid[IW_ESSID_MAX_SIZE];
+       u8 ssid[IEEE80211_MAX_SSID_LEN];
        /* u8 padding[2]; */
 } __packed;
 

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 1a8751eb8140213d962e01ee467d2de900f1feb3..0bc29356ebe4a9651b7824d98c27100e97f4060a 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -309,7 +309,7 @@ struct wl1271_scan {
        unsigned long scanned_ch[BITS_TO_LONGS(WL1271_MAX_CHANNELS)];
        bool failed;
        u8 state;
-       u8 ssid[IW_ESSID_MAX_SIZE+1];
+       u8 ssid[IEEE80211_MAX_SSID_LEN+1];
        size_t ssid_len;
 };
 
@@ -415,7 +415,7 @@ struct wl1271 {
        u8 mac_addr[ETH_ALEN];
        u8 bss_type;
        u8 set_bss_type;
-       u8 ssid[IW_ESSID_MAX_SIZE + 1];
+       u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
        u8 ssid_len;
        int channel;
 

diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h
index 18fe542360f22e5945243d6f52bb95b8917ed2c7..f334ea0817229adc07f39a8bdd37990d2e669894 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h
@@ -77,7 +77,7 @@ struct wl12xx_ie_header {
 
 struct wl12xx_ie_ssid {
        struct wl12xx_ie_header header;
-       char ssid[IW_ESSID_MAX_SIZE];
+       char ssid[IEEE80211_MAX_SSID_LEN];
 } __packed;
 
 struct wl12xx_ie_rates {