1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 3492e89d1dd5..92863780286f 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -153,17 +153,18 @@ static int lbs_adhoc_join(struct lbs_private *priv,
         struct cmd_ds_802_11_ad_hoc_join cmd;
         struct bss_descriptor *bss = &assoc_req->bss;
         u8 preamble = RADIO_PREAMBLE_LONG;
+        DECLARE_SSID_BUF(ssid);
         u16 ratesize = 0;
         int ret = 0;
 
         lbs_deb_enter(LBS_DEB_ASSOC);
 
         lbs_deb_join("current SSID '%s', ssid length %u\n",
-                escape_ssid(priv->curbssparams.ssid,
+                print_ssid(ssid, priv->curbssparams.ssid,
                 priv->curbssparams.ssid_len),
                 priv->curbssparams.ssid_len);
         lbs_deb_join("requested ssid '%s', ssid length %u\n",
-                escape_ssid(bss->ssid, bss->ssid_len),
+                print_ssid(ssid, bss->ssid, bss->ssid_len),
                 bss->ssid_len);
 
         /* check if the requested SSID is already joined */
@@ -308,6 +309,7 @@ static int lbs_adhoc_start(struct lbs_private *priv,
         size_t ratesize = 0;
         u16 tmpcap = 0;
         int ret = 0;
+        DECLARE_SSID_BUF(ssid);
 
         lbs_deb_enter(LBS_DEB_ASSOC);
 
@@ -327,7 +329,7 @@ static int lbs_adhoc_start(struct lbs_private *priv,
         memcpy(cmd.ssid, assoc_req->ssid, assoc_req->ssid_len);
 
         lbs_deb_join("ADHOC_START: SSID '%s', ssid length %u\n",
-                escape_ssid(assoc_req->ssid, assoc_req->ssid_len),
+                print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len),
                 assoc_req->ssid_len);
 
         cmd.bsstype = CMD_BSS_TYPE_IBSS;
@@ -695,6 +697,7 @@ static int assoc_helper_essid(struct lbs_private *priv,
         int ret = 0;
         struct bss_descriptor * bss;
         int channel = -1;
+        DECLARE_SSID_BUF(ssid);
 
         lbs_deb_enter(LBS_DEB_ASSOC);
 
@@ -706,7 +709,7 @@ static int assoc_helper_essid(struct lbs_private *priv,
                 channel = assoc_req->channel;
 
         lbs_deb_assoc("SSID '%s' requested\n",
-                      escape_ssid(assoc_req->ssid, assoc_req->ssid_len));
+                      print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len));
         if (assoc_req->mode == IW_MODE_INFRA) {
                 lbs_send_specific_ssid_scan(priv, assoc_req->ssid,
                         assoc_req->ssid_len);
@@ -1207,6 +1210,7 @@ void lbs_association_worker(struct work_struct *work)
         struct assoc_request * assoc_req = NULL;
         int ret = 0;
         int find_any_ssid = 0;
+        DECLARE_SSID_BUF(ssid);
 
         lbs_deb_enter(LBS_DEB_ASSOC);
 
@@ -1230,7 +1234,7 @@ void lbs_association_worker(struct work_struct *work)
                 "    secinfo:  %s%s%s\n"
                 "    auth_mode: %d\n",
                 assoc_req->flags,
-                escape_ssid(assoc_req->ssid, assoc_req->ssid_len),
+                print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len),
                 assoc_req->channel, assoc_req->band, assoc_req->mode,
                 assoc_req->bssid,
                 assoc_req->secinfo.WPAenabled ? " WPA" : "",
@@ -1767,6 +1771,7 @@ static int lbs_adhoc_post(struct lbs_private *priv, struct cmd_header *resp)
         struct cmd_ds_802_11_ad_hoc_result *adhoc_resp;
         union iwreq_data wrqu;
         struct bss_descriptor *bss;
+        DECLARE_SSID_BUF(ssid);
 
         lbs_deb_enter(LBS_DEB_JOIN);
 
@@ -1816,7 +1821,7 @@ static int lbs_adhoc_post(struct lbs_private *priv, struct cmd_header *resp)
         wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
 
         lbs_deb_join("ADHOC_RESP: Joined/started '%s', BSSID %pM, channel %d\n",
-                     escape_ssid(bss->ssid, bss->ssid_len),
+                     print_ssid(ssid, bss->ssid, bss->ssid_len),
                      priv->curbssparams.bssid,
                      priv->curbssparams.channel);