diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-09-24 18:13:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:46 -0400 |
commit | 7e272fcff6f0a32a3d46e600ea5895f6058f4e2d (patch) | |
tree | 39857028913862af4d71170d1f16ee360ba49115 /net/ieee80211/ieee80211_wx.c | |
parent | ddf4ac53fb8a12a027c0486db743ae040f45b56a (diff) |
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.c | 6 |
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, | |||
283 | else | 283 | else |
284 | IEEE80211_DEBUG_SCAN("Not showing network '%s (" | 284 | IEEE80211_DEBUG_SCAN("Not showing network '%s (" |
285 | "%pM)' due to age (%dms).\n", | 285 | "%pM)' due to age (%dms).\n", |
286 | escape_essid(network->ssid, | 286 | escape_ssid(network->ssid, |
287 | network->ssid_len), | 287 | network->ssid_len), |
288 | network->bssid, | 288 | network->bssid, |
289 | jiffies_to_msecs(jiffies - | 289 | jiffies_to_msecs(jiffies - |
290 | network-> | 290 | network-> |
@@ -408,7 +408,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, | |||
408 | memset(sec.keys[key] + erq->length, 0, | 408 | memset(sec.keys[key] + erq->length, 0, |
409 | len - erq->length); | 409 | len - erq->length); |
410 | IEEE80211_DEBUG_WX("Setting key %d to '%s' (%d:%d bytes)\n", | 410 | IEEE80211_DEBUG_WX("Setting key %d to '%s' (%d:%d bytes)\n", |
411 | key, escape_essid(sec.keys[key], len), | 411 | key, escape_ssid(sec.keys[key], len), |
412 | erq->length, len); | 412 | erq->length, len); |
413 | sec.key_sizes[key] = len; | 413 | sec.key_sizes[key] = len; |
414 | if (*crypt) | 414 | if (*crypt) |