1 files changed, 12 insertions, 7 deletions

diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index f15f82e7bbfd..d19c8de6ef25 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1124,6 +1124,7 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element
                                       *info_element, u16 length,
                                       struct ieee80211_network *network)
 {
+        DECLARE_SSID_BUF(ssid);
         u8 i;
 #ifdef CONFIG_IEEE80211_DEBUG
         char rates_str[64];
@@ -1155,7 +1156,8 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element
                                        IW_ESSID_MAX_SIZE - network->ssid_len);
 
                         IEEE80211_DEBUG_MGMT("MFIE_TYPE_SSID: '%s' len=%d.\n",
-                                             escape_ssid(network->ssid),
+                                             print_ssid(ssid, network->ssid,
+                                                        network->ssid_len),
                                              network->ssid_len);
                         break;
 
@@ -1401,6 +1403,8 @@ static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee8021
                                          struct ieee80211_network *network,
                                          struct ieee80211_rx_stats *stats)
 {
+        DECLARE_SSID_BUF(ssid);
+
         network->qos_data.active = 0;
         network->qos_data.supported = 0;
         network->qos_data.param_count = 0;
@@ -1449,7 +1453,7 @@ static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee8021
         if (network->mode == 0) {
                 IEEE80211_DEBUG_SCAN("Filtered out '%s (%pM)' "
                                      "network.\n",
-                                     escape_ssid(network->ssid,
+                                     print_ssid(ssid, network->ssid,
                                                  network->ssid_len),
                                      network->bssid);
                 return 1;
@@ -1563,10 +1567,11 @@ static void ieee80211_process_probe_response(struct ieee80211_device
         struct ieee80211_info_element *info_element = beacon->info_element;
 #endif
         unsigned long flags;
+        DECLARE_SSID_BUF(ssid);
 
         IEEE80211_DEBUG_SCAN("'%s' (%pM"
                      "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
-                     escape_ssid(info_element->data, info_element->len),
+                     print_ssid(ssid, info_element->data, info_element->len),
                      beacon->header.addr3,
                      (beacon->capability & cpu_to_le16(1 << 0xf)) ? '1' : '0',
                      (beacon->capability & cpu_to_le16(1 << 0xe)) ? '1' : '0',
@@ -1587,7 +1592,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device
 
         if (ieee80211_network_init(ieee, beacon, &network, stats)) {
                 IEEE80211_DEBUG_SCAN("Dropped '%s' (%pM) via %s.\n",
-                                     escape_ssid(info_element->data,
+                                     print_ssid(ssid, info_element->data,
                                                  info_element->len),
                                      beacon->header.addr3,
                                      is_beacon(beacon->header.frame_ctl) ?
@@ -1625,7 +1630,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                         target = oldest;
                         IEEE80211_DEBUG_SCAN("Expired '%s' (%pM) from "
                                              "network list.\n",
-                                             escape_ssid(target->ssid,
+                                             print_ssid(ssid, target->ssid,
                                                          target->ssid_len),
                                              target->bssid);
                         ieee80211_network_reset(target);
@@ -1638,7 +1643,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device
 
 #ifdef CONFIG_IEEE80211_DEBUG
                 IEEE80211_DEBUG_SCAN("Adding '%s' (%pM) via %s.\n",
-                                     escape_ssid(network.ssid,
+                                     print_ssid(ssid, network.ssid,
                                                  network.ssid_len),
                                      network.bssid,
                                      is_beacon(beacon->header.frame_ctl) ?
@@ -1649,7 +1654,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                 list_add_tail(&target->list, &ieee->network_list);
         } else {
                 IEEE80211_DEBUG_SCAN("Updating '%s' (%pM) via %s.\n",
-                                     escape_ssid(target->ssid,
+                                     print_ssid(ssid, target->ssid,
                                                  target->ssid_len),
                                      target->bssid,
                                      is_beacon(beacon->header.frame_ctl) ?