wireless: use individual buffers for printing ssid values

Also change escape_ssid to print_ssid to match print_mac semantics.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

5 files changed, 26 insertions, 13 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);
 
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 52feab69ee49..38843c8b919c 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1063,6 +1063,7 @@ int lbs_mesh_config(struct lbs_private *priv, uint16_t action, uint16_t chan)
 {
         struct cmd_ds_mesh_config cmd;
         struct mrvl_meshie *ie;
+        DECLARE_SSID_BUF(ssid);
 
         memset(&cmd, 0, sizeof(cmd));
         cmd.channel = cpu_to_le16(chan);
@@ -1093,7 +1094,7 @@ int lbs_mesh_config(struct lbs_private *priv, uint16_t action, uint16_t chan)
         }
         lbs_deb_cmd("mesh config action %d type %x channel %d SSID %s\n",
                     action, priv->mesh_tlv, chan,
-                    escape_ssid(priv->mesh_ssid, priv->mesh_ssid_len));
+                    print_ssid(ssid, priv->mesh_ssid, priv->mesh_ssid_len));
 
         return __lbs_mesh_config_send(priv, &cmd, action, priv->mesh_tlv);
 }
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 84933203be74..ec4efd7ff3c8 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -66,6 +66,7 @@ static ssize_t lbs_getscantable(struct file *file, char __user *userbuf,
         int numscansdone = 0, res;
         unsigned long addr = get_zeroed_page(GFP_KERNEL);
         char *buf = (char *)addr;
+        DECLARE_SSID_BUF(ssid);
         struct bss_descriptor * iter_bss;
 
         pos += snprintf(buf+pos, len-pos,
@@ -86,7 +87,8 @@ static ssize_t lbs_getscantable(struct file *file, char __user *userbuf,
                                 spectrum_mgmt ? 'S' : ' ');
                 pos += snprintf(buf+pos, len-pos, " %04d |", SCAN_RSSI(iter_bss->rssi));
                 pos += snprintf(buf+pos, len-pos, " %s\n",
-                                escape_ssid(iter_bss->ssid, iter_bss->ssid_len));
+                                print_ssid(ssid, iter_bss->ssid,
+                                           iter_bss->ssid_len));
 
                 numscansdone++;
         }
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 7881890a4e98..5c34ac588189 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -362,6 +362,7 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
 #ifdef CONFIG_LIBERTAS_DEBUG
         struct bss_descriptor *iter;
         int i = 0;
+        DECLARE_SSID_BUF(ssid);
 #endif
 
         lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d", full_scan);
@@ -455,7 +456,7 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
         list_for_each_entry(iter, &priv->network_list, list)
                 lbs_deb_scan("%02d: BSSID %pM, RSSI %d, SSID '%s'\n",
                              i++, iter->bssid, iter->rssi,
-                             escape_ssid(iter->ssid, iter->ssid_len));
+                             print_ssid(ssid, iter->ssid, iter->ssid_len));
         mutex_unlock(&priv->lock);
 #endif
 
@@ -514,6 +515,7 @@ static int lbs_process_bss(struct bss_descriptor *bss,
         struct ieeetypes_dsparamset *pDS;
         struct ieeetypes_cfparamset *pCF;
         struct ieeetypes_ibssparamset *pibss;
+        DECLARE_SSID_BUF(ssid);
         struct ieeetypes_countryinfoset *pcountryinfo;
         uint8_t *pos, *end, *p;
         uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
@@ -602,7 +604,7 @@ static int lbs_process_bss(struct bss_descriptor *bss,
                         bss->ssid_len = min_t(int, 32, elem->len);
                         memcpy(bss->ssid, elem->data, bss->ssid_len);
                         lbs_deb_scan("got SSID IE: '%s', len %u\n",
-                                     escape_ssid(bss->ssid, bss->ssid_len),
+                                     print_ssid(ssid, bss->ssid, bss->ssid_len),
                                      bss->ssid_len);
                         break;
 
@@ -742,10 +744,11 @@ done:
 int lbs_send_specific_ssid_scan(struct lbs_private *priv, uint8_t *ssid,
                                 uint8_t ssid_len)
 {
+        DECLARE_SSID_BUF(ssid_buf);
         int ret = 0;
 
         lbs_deb_enter_args(LBS_DEB_SCAN, "SSID '%s'\n",
-                           escape_ssid(ssid, ssid_len));
+                           print_ssid(ssid_buf, ssid, ssid_len));
 
         if (!ssid_len)
                 goto out;
@@ -940,6 +943,7 @@ out:
 int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
                  union iwreq_data *wrqu, char *extra)
 {
+        DECLARE_SSID_BUF(ssid);
         struct lbs_private *priv = dev->priv;
         int ret = 0;
 
@@ -969,7 +973,7 @@ int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
                 priv->scan_ssid_len = req->essid_len;
                 memcpy(priv->scan_ssid, req->essid, priv->scan_ssid_len);
                 lbs_deb_wext("set_scan, essid '%s'\n",
-                        escape_ssid(priv->scan_ssid, priv->scan_ssid_len));
+                        print_ssid(ssid, priv->scan_ssid, priv->scan_ssid_len));
         } else {
                 priv->scan_ssid_len = 0;
         }
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 247579951858..d4c6a659b562 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1978,6 +1978,7 @@ static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,
         u8 ssid_len = 0;
         struct assoc_request * assoc_req;
         int in_ssid_len = dwrq->length;
+        DECLARE_SSID_BUF(ssid_buf);
 
         lbs_deb_enter(LBS_DEB_WEXT);
 
@@ -2006,7 +2007,7 @@ static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,
                 lbs_deb_wext("requested any SSID\n");
         } else {
                 lbs_deb_wext("requested SSID '%s'\n",
-                             escape_ssid(ssid, ssid_len));
+                             print_ssid(ssid_buf, ssid, ssid_len));
         }
 
 out: