[PATCH] libertas: remove structure WLAN_802_11_SSID and libertas_escape_essid

Replace WLAN_802_11_SSID with direct 'ssid' and 'ssid_len' members
like ieee80211.  In the process, remove private libertas_escape_essid
and depend on the ieee80211 implementation of escape_essid instead.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 91ac744ab9bc..d6c340aef681 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -66,7 +66,8 @@ struct current_bss_params {
         /** bssid */
         u8 bssid[ETH_ALEN];
         /** ssid */
-        struct WLAN_802_11_SSID ssid;
+        u8 ssid[IW_ESSID_MAX_SIZE + 1];
+        u8 ssid_len;
 
         /** band */
         u8 band;
@@ -178,7 +179,8 @@ struct assoc_request {
 #define ASSOC_FLAG_WPA_IE               11
         unsigned long flags;
 
-        struct WLAN_802_11_SSID ssid;
+        u8 ssid[IW_ESSID_MAX_SIZE + 1];
+        u8 ssid_len;
         u8 channel;
         u8 band;
         u8 mode;
@@ -256,8 +258,9 @@ struct _wlan_adapter {
         /* IW_MODE_* */
         u8 mode;
 
-        struct WLAN_802_11_SSID previousssid;
-        u8 previousbssid[ETH_ALEN];
+        u8 prev_ssid[IW_ESSID_MAX_SIZE + 1];
+        u8 prev_ssid_len;
+        u8 prev_bssid[ETH_ALEN];
 
         /* Scan results list */
         struct list_head network_list;