aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/main.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2008-09-24 18:13:14 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:46 -0400
commit7e272fcff6f0a32a3d46e600ea5895f6058f4e2d (patch)
tree39857028913862af4d71170d1f16ee360ba49115 /drivers/net/wireless/libertas/main.c
parentddf4ac53fb8a12a027c0486db743ae040f45b56a (diff)
wireless: consolidate on a single escape_essid implementation
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r--drivers/net/wireless/libertas/main.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 34a47f692bd6..e9d23f68174f 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1646,33 +1646,6 @@ out:
1646 return ret; 1646 return ret;
1647} 1647}
1648 1648
1649#ifndef CONFIG_IEEE80211
1650const char *escape_essid(const char *essid, u8 essid_len)
1651{
1652 static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
1653 const char *s = essid;
1654 char *d = escaped;
1655
1656 if (ieee80211_is_empty_essid(essid, essid_len)) {
1657 memcpy(escaped, "<hidden>", sizeof("<hidden>"));
1658 return escaped;
1659 }
1660
1661 essid_len = min(essid_len, (u8) IW_ESSID_MAX_SIZE);
1662 while (essid_len--) {
1663 if (*s == '\0') {
1664 *d++ = '\\';
1665 *d++ = '0';
1666 s++;
1667 } else {
1668 *d++ = *s++;
1669 }
1670 }
1671 *d = '\0';
1672 return escaped;
1673}
1674#endif
1675
1676module_init(lbs_init_module); 1649module_init(lbs_init_module);
1677module_exit(lbs_exit_module); 1650module_exit(lbs_exit_module);
1678 1651