summaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_wx.c
diff options
context:
space:
mode:
authorJohn W. Linville2008-09-25 00:13:14 +0200
committerJohn W. Linville2008-11-01 00:00:46 +0100
commit7e272fcff6f0a32a3d46e600ea5895f6058f4e2d (patch)
tree39857028913862af4d71170d1f16ee360ba49115 /net/ieee80211/ieee80211_wx.c
parentmac80211: insert AP sta entry after filling it (diff)
downloadkernel-qcow2-linux-7e272fcff6f0a32a3d46e600ea5895f6058f4e2d.tar.gz
kernel-qcow2-linux-7e272fcff6f0a32a3d46e600ea5895f6058f4e2d.tar.xz
kernel-qcow2-linux-7e272fcff6f0a32a3d46e600ea5895f6058f4e2d.zip
wireless: consolidate on a single escape_essid implementation
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211/ieee80211_wx.c')
-rw-r--r--net/ieee80211/ieee80211_wx.c6
1 files changed, 3 insertions, 3 deletions
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)