>From 3ecd1083f2e095172f0b69f0082ed41ff58a3a84 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 8 May 2007 15:28:55 -0400 Subject: [PATCH] libertas: rename escape_essid() to _escape_essid() in assoc.c We took escape_essid from the 80211 stack so that we wouldn't have to include it (until there's a generic 80211 lib), but there are name conflicts if both modules are included. Thanks to Pavel Machek for pointing that out. Aside from renaming it, I've also made it static (since it's not used outside of assoc.c) and updated the comment describing its origin. Signed-off-by: Andres Salomon --- drivers/net/wireless/libertas/assoc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index aa70a2a..2f1e182 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c @@ -14,8 +14,8 @@ static const u8 bssid_any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -/* From ieee80211_module.c */ -const char *escape_essid(const char *essid, u8 essid_len) +/* Taken from ieee80211_module.c so that we don't have to depend upon it */ +static const char *_escape_essid(const char *essid, u8 essid_len) { static char escaped[IW_ESSID_MAX_SIZE * 2 + 1]; const char *s = essid; @@ -55,7 +55,7 @@ static void print_assoc_req(const char * extra, struct assoc_request * assoc_req " auth_alg: %d\n" " encmode: %d\n", extra, assoc_req->flags, - escape_essid(assoc_req->ssid.ssid, assoc_req->ssid.ssidlength), + _escape_essid(assoc_req->ssid.ssid, assoc_req->ssid.ssidlength), assoc_req->channel, assoc_req->band, assoc_req->mode, MAC_ARG(assoc_req->bssid), assoc_req->secinfo.WPAenabled, assoc_req->secinfo.WPA2enabled, assoc_req->secinfo.WEPstatus, @@ -617,8 +617,8 @@ lbs_deb_assoc("ASSOC(:%d) wpa_keys: ret = %d\n", __LINE__, ret); if (success) { lbs_deb_assoc("ASSOC: association attempt successful. " "Associated to '%s' (" MAC_FMT ")\n", - escape_essid(adapter->curbssparams.ssid.ssid, - adapter->curbssparams.ssid.ssidlength), + _escape_essid(adapter->curbssparams.ssid.ssid, + adapter->curbssparams.ssid.ssidlength), MAC_ARG(adapter->curbssparams.bssid)); libertas_prepare_and_send_command(priv, cmd_802_11_rssi, -- 1.5.1.3