wireless: consolidate on a single escape_essid implementation

[safe/jmp/linux-2.6] / net / ieee80211 / ieee80211_wx.c

diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 89a8106..3b031c2 100644 (file)
--- 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)