aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2100.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
-rw-r--r--drivers/net/wireless/ipw2100.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 079dbd07e2f6..223914e3e07e 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1975,7 +1975,7 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
1975 } 1975 }
1976 1976
1977 IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID=%pM)\n", 1977 IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID=%pM)\n",
1978 priv->net_dev->name, escape_essid(essid, essid_len), 1978 priv->net_dev->name, escape_ssid(essid, essid_len),
1979 txratename, chan, bssid); 1979 txratename, chan, bssid);
1980 1980
1981 /* now we copy read ssid into dev */ 1981 /* now we copy read ssid into dev */
@@ -2003,7 +2003,7 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
2003 }; 2003 };
2004 int err; 2004 int err;
2005 2005
2006 IPW_DEBUG_HC("SSID: '%s'\n", escape_essid(essid, ssid_len)); 2006 IPW_DEBUG_HC("SSID: '%s'\n", escape_ssid(essid, ssid_len));
2007 2007
2008 if (ssid_len) 2008 if (ssid_len)
2009 memcpy(cmd.host_command_parameters, essid, ssid_len); 2009 memcpy(cmd.host_command_parameters, essid, ssid_len);
@@ -2046,7 +2046,7 @@ static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
2046{ 2046{
2047 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC, 2047 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
2048 "disassociated: '%s' %pM \n", 2048 "disassociated: '%s' %pM \n",
2049 escape_essid(priv->essid, priv->essid_len), 2049 escape_ssid(priv->essid, priv->essid_len),
2050 priv->bssid); 2050 priv->bssid);
2051 2051
2052 priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING); 2052 priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
@@ -6987,7 +6987,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev,
6987 goto done; 6987 goto done;
6988 } 6988 }
6989 6989
6990 IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_essid(essid, length), 6990 IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_ssid(essid, length),
6991 length); 6991 length);
6992 6992
6993 priv->essid_len = length; 6993 priv->essid_len = length;
@@ -7014,7 +7014,7 @@ static int ipw2100_wx_get_essid(struct net_device *dev,
7014 * configured ESSID then return that; otherwise return ANY */ 7014 * configured ESSID then return that; otherwise return ANY */
7015 if (priv->config & CFG_STATIC_ESSID || priv->status & STATUS_ASSOCIATED) { 7015 if (priv->config & CFG_STATIC_ESSID || priv->status & STATUS_ASSOCIATED) {
7016 IPW_DEBUG_WX("Getting essid: '%s'\n", 7016 IPW_DEBUG_WX("Getting essid: '%s'\n",
7017 escape_essid(priv->essid, priv->essid_len)); 7017 escape_ssid(priv->essid, priv->essid_len));
7018 memcpy(extra, priv->essid, priv->essid_len); 7018 memcpy(extra, priv->essid, priv->essid_len);
7019 wrqu->essid.length = priv->essid_len; 7019 wrqu->essid.length = priv->essid_len;
7020 wrqu->essid.flags = 1; /* active */ 7020 wrqu->essid.flags = 1; /* active */