diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-07-13 04:39:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-08 14:26:19 -0400 |
commit | 3b40c04071ce3c0d74d19518ef884fed5c981fd7 (patch) | |
tree | 3ecb9342de25367bc4181ec931a35c5a8ebff3cc /drivers/net/wireless | |
parent | 029111e1c62f4f5ceb2a478ebb82bae9f882646a (diff) |
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/wl12xx/cmd.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/scan.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx_80211.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/wl12xx/cmd.h b/drivers/net/wireless/wl12xx/cmd.h index 1f7037292c15..bba077ecd945 100644 --- a/drivers/net/wireless/wl12xx/cmd.h +++ b/drivers/net/wireless/wl12xx/cmd.h | |||
@@ -239,7 +239,7 @@ struct wl1271_cmd_join { | |||
239 | u8 bss_type; | 239 | u8 bss_type; |
240 | u8 channel; | 240 | u8 channel; |
241 | u8 ssid_len; | 241 | u8 ssid_len; |
242 | u8 ssid[IW_ESSID_MAX_SIZE]; | 242 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
243 | u8 ctrl; /* JOIN_CMD_CTRL_* */ | 243 | u8 ctrl; /* JOIN_CMD_CTRL_* */ |
244 | u8 reserved[3]; | 244 | u8 reserved[3]; |
245 | } __packed; | 245 | } __packed; |
@@ -528,7 +528,7 @@ struct wl1271_cmd_bss_start { | |||
528 | /* wl1271_ssid_type */ | 528 | /* wl1271_ssid_type */ |
529 | u8 ssid_type; | 529 | u8 ssid_type; |
530 | u8 ssid_len; | 530 | u8 ssid_len; |
531 | u8 ssid[IW_ESSID_MAX_SIZE]; | 531 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
532 | u8 padding_1[2]; | 532 | u8 padding_1[2]; |
533 | 533 | ||
534 | /* Basic rate set */ | 534 | /* Basic rate set */ |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index e58c22d21e39..3418299e17c8 100644 --- 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, | |||
1997 | wl1271_power_off(wl); | 1997 | wl1271_power_off(wl); |
1998 | 1998 | ||
1999 | memset(wl->bssid, 0, ETH_ALEN); | 1999 | memset(wl->bssid, 0, ETH_ALEN); |
2000 | memset(wl->ssid, 0, IW_ESSID_MAX_SIZE + 1); | 2000 | memset(wl->ssid, 0, IEEE80211_MAX_SSID_LEN + 1); |
2001 | wl->ssid_len = 0; | 2001 | wl->ssid_len = 0; |
2002 | wl->bss_type = MAX_BSS_TYPE; | 2002 | wl->bss_type = MAX_BSS_TYPE; |
2003 | wl->set_bss_type = MAX_BSS_TYPE; | 2003 | wl->set_bss_type = MAX_BSS_TYPE; |
diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/wl12xx/scan.h index d882e4da71b7..0b2a2987439d 100644 --- a/drivers/net/wireless/wl12xx/scan.h +++ b/drivers/net/wireless/wl12xx/scan.h | |||
@@ -77,7 +77,7 @@ struct basic_scan_params { | |||
77 | u8 ssid_len; | 77 | u8 ssid_len; |
78 | /* in order to align */ | 78 | /* in order to align */ |
79 | u8 padding1[2]; | 79 | u8 padding1[2]; |
80 | u8 ssid[IW_ESSID_MAX_SIZE]; | 80 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
81 | /* Band to scan */ | 81 | /* Band to scan */ |
82 | u8 band; | 82 | u8 band; |
83 | u8 use_ssid_list; | 83 | u8 use_ssid_list; |
@@ -167,7 +167,7 @@ struct wl1271_cmd_sched_scan_config { | |||
167 | u8 filter_type; | 167 | u8 filter_type; |
168 | 168 | ||
169 | u8 ssid_len; /* For SCAN_SSID_FILTER_SPECIFIC */ | 169 | u8 ssid_len; /* For SCAN_SSID_FILTER_SPECIFIC */ |
170 | u8 ssid[IW_ESSID_MAX_SIZE]; | 170 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
171 | 171 | ||
172 | u8 n_probe_reqs; /* Number of probes requests per channel */ | 172 | u8 n_probe_reqs; /* Number of probes requests per channel */ |
173 | 173 | ||
@@ -194,7 +194,7 @@ enum { | |||
194 | struct wl1271_ssid { | 194 | struct wl1271_ssid { |
195 | u8 type; | 195 | u8 type; |
196 | u8 len; | 196 | u8 len; |
197 | u8 ssid[IW_ESSID_MAX_SIZE]; | 197 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
198 | /* u8 padding[2]; */ | 198 | /* u8 padding[2]; */ |
199 | } __packed; | 199 | } __packed; |
200 | 200 | ||
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h index 1a8751eb8140..0bc29356ebe4 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h | |||
@@ -309,7 +309,7 @@ struct wl1271_scan { | |||
309 | unsigned long scanned_ch[BITS_TO_LONGS(WL1271_MAX_CHANNELS)]; | 309 | unsigned long scanned_ch[BITS_TO_LONGS(WL1271_MAX_CHANNELS)]; |
310 | bool failed; | 310 | bool failed; |
311 | u8 state; | 311 | u8 state; |
312 | u8 ssid[IW_ESSID_MAX_SIZE+1]; | 312 | u8 ssid[IEEE80211_MAX_SSID_LEN+1]; |
313 | size_t ssid_len; | 313 | size_t ssid_len; |
314 | }; | 314 | }; |
315 | 315 | ||
@@ -415,7 +415,7 @@ struct wl1271 { | |||
415 | u8 mac_addr[ETH_ALEN]; | 415 | u8 mac_addr[ETH_ALEN]; |
416 | u8 bss_type; | 416 | u8 bss_type; |
417 | u8 set_bss_type; | 417 | u8 set_bss_type; |
418 | u8 ssid[IW_ESSID_MAX_SIZE + 1]; | 418 | u8 ssid[IEEE80211_MAX_SSID_LEN + 1]; |
419 | u8 ssid_len; | 419 | u8 ssid_len; |
420 | int channel; | 420 | int channel; |
421 | 421 | ||
diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h index 18fe542360f2..f334ea081722 100644 --- a/drivers/net/wireless/wl12xx/wl12xx_80211.h +++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h | |||
@@ -77,7 +77,7 @@ struct wl12xx_ie_header { | |||
77 | 77 | ||
78 | struct wl12xx_ie_ssid { | 78 | struct wl12xx_ie_ssid { |
79 | struct wl12xx_ie_header header; | 79 | struct wl12xx_ie_header header; |
80 | char ssid[IW_ESSID_MAX_SIZE]; | 80 | char ssid[IEEE80211_MAX_SSID_LEN]; |
81 | } __packed; | 81 | } __packed; |
82 | 82 | ||
83 | struct wl12xx_ie_rates { | 83 | struct wl12xx_ie_rates { |