wireless: remove NETWORK_EMPTY_ESSID flag

It is unnecessary and of questionable value.  Also remove
is_empty_ssid, as it is also unnecessary.

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

2 files changed, 5 insertions, 22 deletions

diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 876a004918b0..f15f82e7bbfd 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1146,12 +1146,6 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element
 
                 switch (info_element->id) {
                 case MFIE_TYPE_SSID:
-                        if (is_empty_ssid(info_element->data,
-                                          info_element->len)) {
-                                network->flags |= NETWORK_EMPTY_ESSID;
-                                break;
-                        }
-
                         network->ssid_len = min(info_element->len,
                                                 (u8) IW_ESSID_MAX_SIZE);
                         memcpy(network->ssid, info_element->data,
@@ -1161,7 +1155,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",
-                                             network->ssid, network->ssid_len);
+                                             escape_ssid(network->ssid),
+                                             network->ssid_len);
                         break;
 
                 case MFIE_TYPE_RATES:
@@ -1391,9 +1386,6 @@ static int ieee80211_handle_assoc_resp(struct ieee80211_device *ieee, struct iee
                         network->mode |= IEEE_B;
         }
 
-        if (is_empty_ssid(network->ssid, network->ssid_len))
-                network->flags |= NETWORK_EMPTY_ESSID;
-
         memcpy(&network->stats, stats, sizeof(network->stats));
 
         if (ieee->handle_assoc_response != NULL)
@@ -1463,9 +1455,6 @@ static int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee8021
                 return 1;
         }
 
-        if (is_empty_ssid(network->ssid, network->ssid_len))
-                network->flags |= NETWORK_EMPTY_ESSID;
-
         memcpy(&network->stats, stats, sizeof(network->stats));
 
         return 0;
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 3b031c2910ac..3025140ae721 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -65,15 +65,9 @@ static char *ieee80211_translate_scan(struct ieee80211_device *ieee,
         /* Add the ESSID */
         iwe.cmd = SIOCGIWESSID;
         iwe.u.data.flags = 1;
-        if (network->flags & NETWORK_EMPTY_ESSID) {
-                iwe.u.data.length = sizeof("<hidden>");
-                start = iwe_stream_add_point(info, start, stop,
-                                             &iwe, "<hidden>");
-        } else {
-                iwe.u.data.length = min(network->ssid_len, (u8) 32);
-                start = iwe_stream_add_point(info, start, stop,
-                                             &iwe, network->ssid);
-        }
+        iwe.u.data.length = min(network->ssid_len, (u8) 32);
+        start = iwe_stream_add_point(info, start, stop,
+                                     &iwe, network->ssid);
 
         /* Add the protocol name */
         iwe.cmd = SIOCGIWNAME;