wireless: consolidate on a single escape_essid implementation

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

4 files changed, 20 insertions, 44 deletions

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index df9624c3cebf..d2282bb2e4f1 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -11,6 +11,7 @@ config IEEE80211
         select IEEE80211_CRYPT_WEP
         select IEEE80211_CRYPT_TKIP
         select IEEE80211_CRYPT_CCMP
+        select LIB80211
         ---help---
         This option enables the hardware independent IEEE 802.11
         networking stack.  This component is deprecated in favor of the
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index 949772a5a7dc..d34d4e79b6f7 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -308,31 +308,5 @@ MODULE_PARM_DESC(debug, "debug output mask");
 module_exit(ieee80211_exit);
 module_init(ieee80211_init);
 
-const char *escape_essid(const char *essid, u8 essid_len)
-{
-        static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
-        const char *s = essid;
-        char *d = escaped;
-
-        if (ieee80211_is_empty_essid(essid, essid_len)) {
-                memcpy(escaped, "<hidden>", sizeof("<hidden>"));
-                return escaped;
-        }
-
-        essid_len = min(essid_len, (u8) IW_ESSID_MAX_SIZE);
-        while (essid_len--) {
-                if (*s == '\0') {
-                        *d++ = '\\';
-                        *d++ = '0';
-                        s++;
-                } else {
-                        *d++ = *s++;
-                }
-        }
-        *d = '\0';
-        return escaped;
-}
-
 EXPORT_SYMBOL(alloc_ieee80211);
 EXPORT_SYMBOL(free_ieee80211);
-EXPORT_SYMBOL(escape_essid);
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 281223e41c58..876a004918b0 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -32,6 +32,7 @@
 #include <asm/uaccess.h>
 #include <linux/ctype.h>
 
+#include <net/lib80211.h>
 #include <net/ieee80211.h>
 
 static void ieee80211_monitor_rx(struct ieee80211_device *ieee,
@@ -1145,8 +1146,8 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element
 
                 switch (info_element->id) {
                 case MFIE_TYPE_SSID:
-                        if (ieee80211_is_empty_essid(info_element->data,
-                                                     info_element->len)) {
+                        if (is_empty_ssid(info_element->data,
+                                          info_element->len)) {
                                 network->flags |= NETWORK_EMPTY_ESSID;
                                 break;
                         }
@@ -1390,7 +1391,7 @@ static int ieee80211_handle_assoc_resp(struct ieee80211_device *ieee, struct iee
                         network->mode |= IEEE_B;
         }
 
-        if (ieee80211_is_empty_essid(network->ssid, network->ssid_len))
+        if (is_empty_ssid(network->ssid, network->ssid_len))
                 network->flags |= NETWORK_EMPTY_ESSID;
 
         memcpy(&network->stats, stats, sizeof(network->stats));
@@ -1456,13 +1457,13 @@ 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_essid(network->ssid,
-                                                  network->ssid_len),
+                                     escape_ssid(network->ssid,
+                                                 network->ssid_len),
                                      network->bssid);
                 return 1;
         }
 
-        if (ieee80211_is_empty_essid(network->ssid, network->ssid_len))
+        if (is_empty_ssid(network->ssid, network->ssid_len))
                 network->flags |= NETWORK_EMPTY_ESSID;
 
         memcpy(&network->stats, stats, sizeof(network->stats));
@@ -1576,7 +1577,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device
 
         IEEE80211_DEBUG_SCAN("'%s' (%pM"
                      "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
-                     escape_essid(info_element->data, info_element->len),
+                     escape_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',
@@ -1597,8 +1598,8 @@ 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_essid(info_element->data,
-                                                  info_element->len),
+                                     escape_ssid(info_element->data,
+                                                 info_element->len),
                                      beacon->header.addr3,
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
@@ -1635,8 +1636,8 @@ static void ieee80211_process_probe_response(struct ieee80211_device
                         target = oldest;
                         IEEE80211_DEBUG_SCAN("Expired '%s' (%pM) from "
                                              "network list.\n",
-                                             escape_essid(target->ssid,
-                                                          target->ssid_len),
+                                             escape_ssid(target->ssid,
+                                                         target->ssid_len),
                                              target->bssid);
                         ieee80211_network_reset(target);
                 } else {
@@ -1648,8 +1649,8 @@ static void ieee80211_process_probe_response(struct ieee80211_device
 
 #ifdef CONFIG_IEEE80211_DEBUG
                 IEEE80211_DEBUG_SCAN("Adding '%s' (%pM) via %s.\n",
-                                     escape_essid(network.ssid,
-                                                  network.ssid_len),
+                                     escape_ssid(network.ssid,
+                                                 network.ssid_len),
                                      network.bssid,
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
@@ -1659,8 +1660,8 @@ 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_essid(target->ssid,
-                                                  target->ssid_len),
+                                     escape_ssid(target->ssid,
+                                                 target->ssid_len),
                                      target->bssid,
                                      is_beacon(beacon->header.frame_ctl) ?
                                      "BEACON" : "PROBE RESPONSE");
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 89a81062ab4b..3b031c2910ac 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -283,8 +283,8 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
                 else
                         IEEE80211_DEBUG_SCAN("Not showing network '%s ("
                                              "%pM)' due to age (%dms).\n",
-                                             escape_essid(network->ssid,
-                                                          network->ssid_len),
+                                             escape_ssid(network->ssid,
+                                                         network->ssid_len),
                                              network->bssid,
                                              jiffies_to_msecs(jiffies -
                                                               network->
@@ -408,7 +408,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
                         memset(sec.keys[key] + erq->length, 0,
                                len - erq->length);
                 IEEE80211_DEBUG_WX("Setting key %d to '%s' (%d:%d bytes)\n",
-                                   key, escape_essid(sec.keys[key], len),
+                                   key, escape_ssid(sec.keys[key], len),
                                    erq->length, len);
                 sec.key_sizes[key] = len;
                 if (*crypt)