[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, 13 insertions, 10 deletions

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 9385df52d7a2..ebedd630d72e 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -61,25 +61,28 @@ void libertas_mac_event_disconnected(wlan_private * priv)
         adapter->nextSNRNF = 0;
         adapter->numSNRNF = 0;
         adapter->rxpd_rate = 0;
-        lbs_deb_cmd("Current SSID=%s, ssid length=%u\n",
-               adapter->curbssparams.ssid.ssid,
-               adapter->curbssparams.ssid.ssidlength);
-        lbs_deb_cmd("Previous SSID=%s, ssid length=%u\n",
-               adapter->previousssid.ssid, adapter->previousssid.ssidlength);
+        lbs_deb_cmd("Current SSID='%s', ssid length=%u\n",
+                    escape_essid(adapter->curbssparams.ssid,
+                                 adapter->curbssparams.ssid_len),
+                    adapter->curbssparams.ssid_len);
+        lbs_deb_cmd("Previous SSID='%s', ssid length=%u\n",
+                    escape_essid(adapter->prev_ssid, adapter->prev_ssid_len),
+                    adapter->prev_ssid_len);
 
         adapter->connect_status = libertas_disconnected;
 
         /* Save previous SSID and BSSID for possible reassociation */
-        memcpy(&adapter->previousssid,
-               &adapter->curbssparams.ssid, sizeof(struct WLAN_802_11_SSID));
-        memcpy(adapter->previousbssid,
-               adapter->curbssparams.bssid, ETH_ALEN);
+        memcpy(&adapter->prev_ssid, &adapter->curbssparams.ssid,
+               IW_ESSID_MAX_SIZE);
+        adapter->prev_ssid_len = adapter->curbssparams.ssid_len;
+        memcpy(adapter->prev_bssid, adapter->curbssparams.bssid, ETH_ALEN);
 
         /* Clear out associated SSID and BSSID since connection is
          * no longer valid.
          */
         memset(&adapter->curbssparams.bssid, 0, ETH_ALEN);
-        memset(&adapter->curbssparams.ssid, 0, sizeof(struct WLAN_802_11_SSID));
+        memset(&adapter->curbssparams.ssid, 0, IW_ESSID_MAX_SIZE);
+        adapter->curbssparams.ssid_len = 0;
 
         if (adapter->psstate != PS_STATE_FULL_POWER) {
                 /* make firmware to exit PS mode */