Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e272fcf authored by John W. Linville's avatar John W. Linville
Browse files

wireless: consolidate on a single escape_essid implementation 



Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ddf4ac53

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ config LIBERTAS 
	tristate "Marvell 8xxx Libertas WLAN driver support"

	depends on WLAN_80211

	select WIRELESS_EXT

	select LIB80211

	select FW_LOADER

	---help---

	  A library for Marvell Libertas 8xxx devices.

drivers/net/wireless/ipw2100.c

+5 −5
Original line number Diff line number Diff line
@@ -1975,7 +1975,7 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status) 
	}



	IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID=%pM)\n",

		       priv->net_dev->name, escape_essid(essid, essid_len),

		       priv->net_dev->name, escape_ssid(essid, essid_len),

		       txratename, chan, bssid);



	/* now we copy read ssid into dev */
@@ -2003,7 +2003,7 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid, 
	};

	int err;



	IPW_DEBUG_HC("SSID: '%s'\n", escape_essid(essid, ssid_len));

	IPW_DEBUG_HC("SSID: '%s'\n", escape_ssid(essid, ssid_len));



	if (ssid_len)

		memcpy(cmd.host_command_parameters, essid, ssid_len);
@@ -2046,7 +2046,7 @@ static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status) 
{

	IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,

		  "disassociated: '%s' %pM \n",

		  escape_essid(priv->essid, priv->essid_len),

		  escape_ssid(priv->essid, priv->essid_len),

		  priv->bssid);



	priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
@@ -6987,7 +6987,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev, 
		goto done;

	}



	IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_essid(essid, length),

	IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_ssid(essid, length),

		     length);



	priv->essid_len = length;
@@ -7014,7 +7014,7 @@ static int ipw2100_wx_get_essid(struct net_device *dev, 
	 * configured ESSID then return that; otherwise return ANY */

	if (priv->config & CFG_STATIC_ESSID || priv->status & STATUS_ASSOCIATED) {

		IPW_DEBUG_WX("Getting essid: '%s'\n",

			     escape_essid(priv->essid, priv->essid_len));

			     escape_ssid(priv->essid, priv->essid_len));

		memcpy(extra, priv->essid, priv->essid_len);

		wrqu->essid.length = priv->essid_len;

		wrqu->essid.flags = 1;	/* active */

drivers/net/wireless/ipw2200.c

+59 −59
Original line number Diff line number Diff line
@@ -4409,7 +4409,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, 
					IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |

						  IPW_DL_ASSOC,

						  "associated: '%s' %pM \n",

						  escape_essid(priv->essid,

						  escape_ssid(priv->essid,

							      priv->essid_len),

						  priv->bssid);
@@ -4490,7 +4490,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, 
							  "deauthenticated: '%s' "

							  "%pM"

							  ": (0x%04X) - %s \n",

							  escape_essid(priv->

							  escape_ssid(priv->

								      essid,

								      priv->

								      essid_len),
@@ -4512,7 +4512,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, 
					IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |

						  IPW_DL_ASSOC,

						  "authenticated: '%s' %pM\n",

						  escape_essid(priv->essid,

						  escape_ssid(priv->essid,

							       priv->essid_len),

						  priv->bssid);

					break;
@@ -4540,7 +4540,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, 
					IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |

						  IPW_DL_ASSOC,

						  "disassociated: '%s' %pM \n",

						  escape_essid(priv->essid,

						  escape_ssid(priv->essid,

							       priv->essid_len),

						  priv->bssid);
@@ -4578,7 +4578,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, 
			case CMAS_AUTHENTICATED:

				IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,

					  "authenticated: '%s' %pM \n",

					  escape_essid(priv->essid,

					  escape_ssid(priv->essid,

						       priv->essid_len),

					  priv->bssid);

				priv->status |= STATUS_AUTH;
@@ -4597,7 +4597,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, 
				IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |

					  IPW_DL_ASSOC,

					  "deauthenticated: '%s' %pM\n",

					  escape_essid(priv->essid,

					  escape_ssid(priv->essid,

						      priv->essid_len),

					  priv->bssid);
@@ -5430,7 +5430,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	     !(network->capability & WLAN_CAPABILITY_IBSS))) {

		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded due to "

				"capability mismatch.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5440,7 +5440,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	if (network->flags & NETWORK_EMPTY_ESSID) {

		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

				"because of hidden ESSID.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5453,7 +5453,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
			   network->ssid_len)) {

			IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

					"because of non-network ESSID.\n",

					escape_essid(network->ssid,

					escape_ssid(network->ssid,

						    network->ssid_len),

					network->bssid);

			return 0;
@@ -5468,12 +5468,12 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
			char escaped[IW_ESSID_MAX_SIZE * 2 + 1];



			strncpy(escaped,

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				sizeof(escaped));

			IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

					"because of ESSID mismatch: '%s'.\n",

					escaped, network->bssid,

					escape_essid(priv->essid,

					escape_ssid(priv->essid,

						    priv->essid_len));

			return 0;

		}
@@ -5485,13 +5485,13 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	if (network->time_stamp[0] < match->network->time_stamp[0]) {

		IPW_DEBUG_MERGE("Network '%s excluded because newer than "

				"current network.\n",

				escape_essid(match->network->ssid,

				escape_ssid(match->network->ssid,

					    match->network->ssid_len));

		return 0;

	} else if (network->time_stamp[1] < match->network->time_stamp[1]) {

		IPW_DEBUG_MERGE("Network '%s excluded because newer than "

				"current network.\n",

				escape_essid(match->network->ssid,

				escape_ssid(match->network->ssid,

					    match->network->ssid_len));

		return 0;

	}
@@ -5501,7 +5501,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	    time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {

		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

				"because of age: %ums.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid,

				jiffies_to_msecs(jiffies -

						 network->last_scanned));
@@ -5512,7 +5512,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	    (network->channel != priv->channel)) {

		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

				"because of channel mismatch: %d != %d.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid,

				network->channel, priv->channel);

		return 0;
@@ -5523,7 +5523,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	    ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {

		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

				"because of privacy mismatch: %s != %s.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid,

				priv->

				capability & CAP_PRIVACY_ON ? "on" : "off",
@@ -5536,7 +5536,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {

		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

				"because of the same BSSID match: %pM"

				".\n", escape_essid(network->ssid,

				".\n", escape_ssid(network->ssid,

						   network->ssid_len),

				network->bssid,

				priv->bssid);
@@ -5548,7 +5548,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

				"because of invalid frequency/mode "

				"combination.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5559,7 +5559,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

				"because configured rate mask excludes "

				"AP mandatory rate.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5567,7 +5567,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	if (rates.num_rates == 0) {

		IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "

				"because of no compatible rates.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5580,7 +5580,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
	ipw_copy_rates(&match->rates, &rates);

	match->network = network;

	IPW_DEBUG_MERGE("Network '%s (%pM)' is a viable match.\n",

			escape_essid(network->ssid, network->ssid_len),

			escape_ssid(network->ssid, network->ssid_len),

			network->bssid);



	return 1;
@@ -5618,7 +5618,7 @@ static void ipw_merge_adhoc_network(struct work_struct *work) 
		mutex_lock(&priv->mutex);

		if ((priv->ieee->iw_mode == IW_MODE_ADHOC)) {

			IPW_DEBUG_MERGE("remove network %s\n",

					escape_essid(priv->essid,

					escape_ssid(priv->essid,

						    priv->essid_len));

			ipw_remove_current_network(priv);

		}
@@ -5644,7 +5644,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	     !(network->capability & WLAN_CAPABILITY_IBSS))) {

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded due to "

				"capability mismatch.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5654,7 +5654,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	if (network->flags & NETWORK_EMPTY_ESSID) {

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of hidden ESSID.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5667,7 +5667,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
			   network->ssid_len)) {

			IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

					"because of non-network ESSID.\n",

					escape_essid(network->ssid,

					escape_ssid(network->ssid,

						     network->ssid_len),

					network->bssid);

			return 0;
@@ -5681,12 +5681,12 @@ static int ipw_best_network(struct ipw_priv *priv, 
			    min(network->ssid_len, priv->essid_len)))) {

			char escaped[IW_ESSID_MAX_SIZE * 2 + 1];

			strncpy(escaped,

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				sizeof(escaped));

			IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

					"because of ESSID mismatch: '%s'.\n",

					escaped, network->bssid,

					escape_essid(priv->essid,

					escape_ssid(priv->essid,

						    priv->essid_len));

			return 0;

		}
@@ -5697,12 +5697,12 @@ static int ipw_best_network(struct ipw_priv *priv, 
	if (match->network && match->network->stats.rssi > network->stats.rssi) {

		char escaped[IW_ESSID_MAX_SIZE * 2 + 1];

		strncpy(escaped,

			escape_essid(network->ssid, network->ssid_len),

			escape_ssid(network->ssid, network->ssid_len),

			sizeof(escaped));

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded because "

				"'%s (%pM)' has a stronger signal.\n",

				escaped, network->bssid,

				escape_essid(match->network->ssid,

				escape_ssid(match->network->ssid,

					    match->network->ssid_len),

				match->network->bssid);

		return 0;
@@ -5715,7 +5715,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of storming (%ums since last "

				"assoc attempt).\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid,

				jiffies_to_msecs(jiffies -

						 network->last_associate));
@@ -5727,7 +5727,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	    time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of age: %ums.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid,

				jiffies_to_msecs(jiffies -

						 network->last_scanned));
@@ -5738,7 +5738,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	    (network->channel != priv->channel)) {

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of channel mismatch: %d != %d.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid,

				network->channel, priv->channel);

		return 0;
@@ -5749,7 +5749,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	    ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of privacy mismatch: %s != %s.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid,

				priv->capability & CAP_PRIVACY_ON ? "on" :

				"off",
@@ -5762,7 +5762,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	    memcmp(network->bssid, priv->bssid, ETH_ALEN)) {

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of BSSID mismatch: %pM.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid, priv->bssid);

		return 0;

	}
@@ -5772,7 +5772,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of invalid frequency/mode "

				"combination.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5781,7 +5781,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	if (!ieee80211_is_valid_channel(priv->ieee, network->channel)) {

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of invalid channel in current GEO\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5792,7 +5792,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because configured rate mask excludes "

				"AP mandatory rate.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5800,7 +5800,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	if (rates.num_rates == 0) {

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "

				"because of no compatible rates.\n",

				escape_essid(network->ssid, network->ssid_len),

				escape_ssid(network->ssid, network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5814,7 +5814,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	match->network = network;



	IPW_DEBUG_ASSOC("Network '%s (%pM)' is a viable match.\n",

			escape_essid(network->ssid, network->ssid_len),

			escape_ssid(network->ssid, network->ssid_len),

			network->bssid);



	return 1;
@@ -6065,7 +6065,7 @@ static void ipw_debug_config(struct ipw_priv *priv) 
		IPW_DEBUG_INFO("Channel unlocked.\n");

	if (priv->config & CFG_STATIC_ESSID)

		IPW_DEBUG_INFO("ESSID locked to '%s'\n",

			       escape_essid(priv->essid, priv->essid_len));

			       escape_ssid(priv->essid, priv->essid_len));

	else

		IPW_DEBUG_INFO("ESSID unlocked.\n");

	if (priv->config & CFG_STATIC_BSSID)
@@ -7352,7 +7352,7 @@ static int ipw_associate_network(struct ipw_priv *priv, 
	IPW_DEBUG_ASSOC("%sssocation attempt: '%s', channel %d, "

			"802.11%c [%d], %s[:%s], enc=%s%s%s%c%c\n",

			roaming ? "Rea" : "A",

			escape_essid(priv->essid, priv->essid_len),

			escape_ssid(priv->essid, priv->essid_len),

			network->channel,

			ipw_modes[priv->assoc_request.ieee_mode],

			rates->num_rates,
@@ -7452,7 +7452,7 @@ static int ipw_associate_network(struct ipw_priv *priv, 
	}



	IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %pM \n",

		  escape_essid(priv->essid, priv->essid_len),

		  escape_ssid(priv->essid, priv->essid_len),

		  priv->bssid);



	return 0;
@@ -7604,7 +7604,7 @@ static int ipw_associate(void *data) 
			target = oldest;

			IPW_DEBUG_ASSOC("Expired '%s' (%pM) from "

					"network list.\n",

					escape_essid(target->ssid,

					escape_ssid(target->ssid,

						    target->ssid_len),

					target->bssid);

			list_add_tail(&target->list,
@@ -9057,7 +9057,7 @@ static int ipw_wx_set_essid(struct net_device *dev, 
		return 0;

	}



	IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_essid(extra, length),

	IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_ssid(extra, length),

		     length);



	priv->essid_len = length;
@@ -9084,7 +9084,7 @@ static int ipw_wx_get_essid(struct net_device *dev, 
	if (priv->config & CFG_STATIC_ESSID ||

	    priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {

		IPW_DEBUG_WX("Getting essid: '%s'\n",

			     escape_essid(priv->essid, priv->essid_len));

			     escape_ssid(priv->essid, priv->essid_len));

		memcpy(extra, priv->essid, priv->essid_len);

		wrqu->essid.length = priv->essid_len;

		wrqu->essid.flags = 1;	/* active */

drivers/net/wireless/ipw2200.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <linux/jiffies.h>

#include <asm/io.h>



#include <net/lib80211.h>

#include <net/ieee80211.h>

#include <net/ieee80211_radiotap.h>

drivers/net/wireless/iwlwifi/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config IWLWIFI 
config IWLCORE

	tristate "Intel Wireless Wifi Core"

	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL

	select LIB80211

	select IWLWIFI

	select MAC80211_LEDS if IWLWIFI_LEDS

	select LEDS_CLASS if IWLWIFI_LEDS
@@ -105,6 +106,7 @@ config IWL3945 
	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"

	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL

	select FW_LOADER

	select LIB80211

	select IWLWIFI

	select MAC80211_LEDS if IWL3945_LEDS

	select LEDS_CLASS if IWL3945_LEDS