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

Commit 9387b7ca authored by John W. Linville's avatar John W. Linville
Browse files

wireless: use individual buffers for printing ssid values 



Also change escape_ssid to print_ssid to match print_mac semantics.

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

drivers/net/wireless/ipw2100.c

+14 −6
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ that only one external action is invoked at a time. 
#include <linux/ctype.h>

#include <linux/pm_qos_params.h>



#include <net/lib80211.h>



#include "ipw2100.h"



#define IPW2100_VERSION "git-1.2.2"
@@ -1914,6 +1916,7 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status) 
	u32 chan;

	char *txratename;

	u8 bssid[ETH_ALEN];

	DECLARE_SSID_BUF(ssid);



	/*

	 * TBD: BSSID is usually 00:00:00:00:00:00 here and not
@@ -1975,7 +1978,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_ssid(essid, essid_len),

		       priv->net_dev->name, print_ssid(ssid, essid, essid_len),

		       txratename, chan, bssid);



	/* now we copy read ssid into dev */
@@ -2002,8 +2005,9 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid, 
		.host_command_length = ssid_len

	};

	int err;

	DECLARE_SSID_BUF(ssid);



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

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



	if (ssid_len)

		memcpy(cmd.host_command_parameters, essid, ssid_len);
@@ -2044,9 +2048,11 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid, 


static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)

{

	DECLARE_SSID_BUF(ssid);



	IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,

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

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

		  print_ssid(ssid, priv->essid, priv->essid_len),

		  priv->bssid);



	priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
@@ -6958,6 +6964,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev, 
	char *essid = "";	/* ANY */

	int length = 0;

	int err = 0;

	DECLARE_SSID_BUF(ssid);



	mutex_lock(&priv->action_mutex);

	if (!(priv->status & STATUS_INITIALIZED)) {
@@ -6987,8 +6994,8 @@ static int ipw2100_wx_set_essid(struct net_device *dev, 
		goto done;

	}



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

		     length);

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

		     print_ssid(ssid, essid, length), length);



	priv->essid_len = length;

	memcpy(priv->essid, essid, priv->essid_len);
@@ -7009,12 +7016,13 @@ static int ipw2100_wx_get_essid(struct net_device *dev, 
	 */



	struct ipw2100_priv *priv = ieee80211_priv(dev);

	DECLARE_SSID_BUF(ssid);



	/* If we are associated, trying to associate, or have a statically

	 * 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_ssid(priv->essid, priv->essid_len));

			     print_ssid(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

+91 −62
Original line number Diff line number Diff line
@@ -4395,6 +4395,7 @@ static void handle_scan_event(struct ipw_priv *priv) 
static void ipw_rx_notification(struct ipw_priv *priv,

				       struct ipw_rx_notification *notif)

{

	DECLARE_SSID_BUF(ssid);

	u16 size = le16_to_cpu(notif->size);

	notif->size = le16_to_cpu(notif->size);
@@ -4409,7 +4410,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_ssid(priv->essid,

						  print_ssid(ssid, priv->essid,

							     priv->essid_len),

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

							  "%pM"

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

							  escape_ssid(priv->

							  print_ssid(ssid,

								     priv->

								     essid,

								     priv->

								     essid_len),
@@ -4512,7 +4514,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_ssid(priv->essid,

						  print_ssid(ssid, priv->essid,

							     priv->essid_len),

						  priv->bssid);

					break;
@@ -4540,7 +4542,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_ssid(priv->essid,

						  print_ssid(ssid, priv->essid,

							     priv->essid_len),

						  priv->bssid);
@@ -4578,7 +4580,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_ssid(priv->essid,

					  print_ssid(ssid, priv->essid,

						     priv->essid_len),

					  priv->bssid);

				priv->status |= STATUS_AUTH;
@@ -4597,7 +4599,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_ssid(priv->essid,

					  print_ssid(ssid, priv->essid,

						     priv->essid_len),

					  priv->bssid);
@@ -5423,6 +5425,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
				  int roaming)

{

	struct ipw_supported_rates rates;

	DECLARE_SSID_BUF(ssid);



	/* Verify that this network's capability is compatible with the

	 * current mode (AdHoc or Infrastructure) */
@@ -5430,7 +5433,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5443,7 +5447,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_ssid(network->ssid,

					print_ssid(ssid, network->ssid,

						   network->ssid_len),

					network->bssid);

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



			strncpy(escaped,

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

				print_ssid(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_ssid(priv->essid,

					print_ssid(ssid, priv->essid,

						   priv->essid_len));

			return 0;

		}
@@ -5475,13 +5480,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_ssid(match->network->ssid,

				print_ssid(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_ssid(match->network->ssid,

				print_ssid(ssid, match->network->ssid,

					   match->network->ssid_len));

		return 0;

	}
@@ -5491,7 +5496,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid,

				jiffies_to_msecs(jiffies -

						 network->last_scanned));
@@ -5502,7 +5508,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid,

				network->channel, priv->channel);

		return 0;
@@ -5513,7 +5520,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid,

				priv->

				capability & CAP_PRIVACY_ON ? "on" : "off",
@@ -5526,7 +5534,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_ssid(network->ssid,

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

						  network->ssid_len),

				network->bssid,

				priv->bssid);
@@ -5538,7 +5546,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5549,7 +5558,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5557,7 +5567,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5570,7 +5581,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_ssid(network->ssid, network->ssid_len),

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

			network->bssid);



	return 1;
@@ -5578,6 +5589,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 


static void ipw_merge_adhoc_network(struct work_struct *work)

{

	DECLARE_SSID_BUF(ssid);

	struct ipw_priv *priv =

		container_of(work, struct ipw_priv, merge_networks);

	struct ieee80211_network *network = NULL;
@@ -5608,7 +5620,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_ssid(priv->essid,

					print_ssid(ssid, priv->essid,

						   priv->essid_len));

			ipw_remove_current_network(priv);

		}
@@ -5625,6 +5637,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
			    struct ieee80211_network *network, int roaming)

{

	struct ipw_supported_rates rates;

	DECLARE_SSID_BUF(ssid);



	/* Verify that this network's capability is compatible with the

	 * current mode (AdHoc or Infrastructure) */
@@ -5634,7 +5647,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5647,7 +5661,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_ssid(network->ssid,

					print_ssid(ssid, network->ssid,

						   network->ssid_len),

					network->bssid);

			return 0;
@@ -5661,12 +5675,13 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(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_ssid(priv->essid,

					print_ssid(ssid, priv->essid,

						   priv->essid_len));

			return 0;

		}
@@ -5677,12 +5692,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_ssid(network->ssid, network->ssid_len),

			print_ssid(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_ssid(match->network->ssid,

				print_ssid(ssid, match->network->ssid,

					   match->network->ssid_len),

				match->network->bssid);

		return 0;
@@ -5695,7 +5710,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid,

				jiffies_to_msecs(jiffies -

						 network->last_associate));
@@ -5707,7 +5723,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid,

				jiffies_to_msecs(jiffies -

						 network->last_scanned));
@@ -5718,7 +5735,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid,

				network->channel, priv->channel);

		return 0;
@@ -5729,7 +5747,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid,

				priv->capability & CAP_PRIVACY_ON ? "on" :

				"off",
@@ -5742,7 +5761,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid, priv->bssid);

		return 0;

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

				"because of invalid frequency/mode "

				"combination.\n",

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

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5761,7 +5782,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5772,7 +5794,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5780,7 +5803,8 @@ 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_ssid(network->ssid, network->ssid_len),

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				network->bssid);

		return 0;

	}
@@ -5794,7 +5818,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_ssid(network->ssid, network->ssid_len),

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

			network->bssid);



	return 1;
@@ -6037,6 +6061,7 @@ static void ipw_bg_adhoc_check(struct work_struct *work) 


static void ipw_debug_config(struct ipw_priv *priv)

{

	DECLARE_SSID_BUF(ssid);

	IPW_DEBUG_INFO("Scan completed, no valid APs matched "

		       "[CFG 0x%08X]\n", priv->config);

	if (priv->config & CFG_STATIC_CHANNEL)
@@ -6045,7 +6070,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_ssid(priv->essid, priv->essid_len));

			       print_ssid(ssid, priv->essid, priv->essid_len));

	else

		IPW_DEBUG_INFO("ESSID unlocked.\n");

	if (priv->config & CFG_STATIC_BSSID)
@@ -7263,6 +7288,7 @@ static int ipw_associate_network(struct ipw_priv *priv, 
				 struct ipw_supported_rates *rates, int roaming)

{

	int err;

	DECLARE_SSID_BUF(ssid);



	if (priv->config & CFG_FIXED_RATE)

		ipw_set_fixed_rate(priv, network->mode);
@@ -7331,7 +7357,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_ssid(priv->essid, priv->essid_len),

			print_ssid(ssid, priv->essid, priv->essid_len),

			network->channel,

			ipw_modes[priv->assoc_request.ieee_mode],

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



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

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

		  print_ssid(ssid, priv->essid, priv->essid_len),

		  priv->bssid);



	return 0;
@@ -7522,6 +7548,7 @@ static int ipw_associate(void *data) 
	struct ipw_supported_rates *rates;

	struct list_head *element;

	unsigned long flags;

	DECLARE_SSID_BUF(ssid);



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

		IPW_DEBUG_ASSOC("Not attempting association (monitor mode)\n");
@@ -7583,7 +7610,7 @@ static int ipw_associate(void *data) 
			target = oldest;

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

					"network list.\n",

					escape_ssid(target->ssid,

					print_ssid(ssid, target->ssid,

						   target->ssid_len),

					target->bssid);

			list_add_tail(&target->list,
@@ -9012,6 +9039,7 @@ static int ipw_wx_set_essid(struct net_device *dev, 
{

	struct ipw_priv *priv = ieee80211_priv(dev);

        int length;

	DECLARE_SSID_BUF(ssid);



        mutex_lock(&priv->mutex);
@@ -9036,8 +9064,8 @@ static int ipw_wx_set_essid(struct net_device *dev, 
		return 0;

	}



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

		     length);

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

		     print_ssid(ssid, extra, length), length);



	priv->essid_len = length;

	memcpy(priv->essid, extra, priv->essid_len);
@@ -9056,6 +9084,7 @@ static int ipw_wx_get_essid(struct net_device *dev, 
			    union iwreq_data *wrqu, char *extra)

{

	struct ipw_priv *priv = ieee80211_priv(dev);

	DECLARE_SSID_BUF(ssid);



	/* If we are associated, trying to associate, or have a statically

	 * configured ESSID then return that; otherwise return ANY */
@@ -9063,7 +9092,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_ssid(priv->essid, priv->essid_len));

			     print_ssid(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/iwlwifi/iwl-scan.c

+4 −3
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ static void iwl_bg_request_scan(struct work_struct *data) 
	u8 n_probes = 2;

	u8 rx_chain = priv->hw_params.valid_rx_ant;

	u8 rate;

	DECLARE_SSID_BUF(ssid);



	conf = ieee80211_get_hw_conf(priv->hw);
@@ -735,7 +736,7 @@ static void iwl_bg_request_scan(struct work_struct *data) 
	/* We should add the ability for user to lock to PASSIVE ONLY */

	if (priv->one_direct_scan) {

		IWL_DEBUG_SCAN("Start direct scan for '%s'\n",

				escape_ssid(priv->direct_ssid,

				print_ssid(ssid, priv->direct_ssid,

					   priv->direct_ssid_len));

		scan->direct_scan[0].id = WLAN_EID_SSID;

		scan->direct_scan[0].len = priv->direct_ssid_len;
@@ -744,7 +745,7 @@ static void iwl_bg_request_scan(struct work_struct *data) 
		n_probes++;

	} else if (!iwl_is_associated(priv) && priv->essid_len) {

		IWL_DEBUG_SCAN("Start direct scan for '%s' (not associated)\n",

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

				print_ssid(ssid, priv->essid, priv->essid_len));

		scan->direct_scan[0].id = WLAN_EID_SSID;

		scan->direct_scan[0].len = priv->essid_len;

		memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);

drivers/net/wireless/iwlwifi/iwl3945-base.c

+6 −3
Original line number Diff line number Diff line
@@ -6054,6 +6054,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data) 
	struct ieee80211_conf *conf = NULL;

	u8 n_probes = 2;

	enum ieee80211_band band;

	DECLARE_SSID_BUF(ssid);



	conf = ieee80211_get_hw_conf(priv->hw);
@@ -6154,7 +6155,8 @@ static void iwl3945_bg_request_scan(struct work_struct *data) 
	if (priv->one_direct_scan) {

		IWL_DEBUG_SCAN

		    ("Kicking off one direct scan for '%s'\n",

		     escape_ssid(priv->direct_ssid, priv->direct_ssid_len));

		     print_ssid(ssid, priv->direct_ssid,

				priv->direct_ssid_len));

		scan->direct_scan[0].id = WLAN_EID_SSID;

		scan->direct_scan[0].len = priv->direct_ssid_len;

		memcpy(scan->direct_scan[0].ssid,
@@ -6163,7 +6165,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data) 
	} else if (!iwl3945_is_associated(priv) && priv->essid_len) {

		IWL_DEBUG_SCAN

		  ("Kicking off one direct scan for '%s' when not associated\n",

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

		   print_ssid(ssid, priv->essid, priv->essid_len));

		scan->direct_scan[0].id = WLAN_EID_SSID;

		scan->direct_scan[0].len = priv->essid_len;

		memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
@@ -6945,6 +6947,7 @@ static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len) 
	int rc = 0;

	unsigned long flags;

	struct iwl3945_priv *priv = hw->priv;

	DECLARE_SSID_BUF(ssid_buf);



	IWL_DEBUG_MAC80211("enter\n");
@@ -6978,7 +6981,7 @@ static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len) 
	}

	if (len) {

		IWL_DEBUG_SCAN("direct scan for %s [%d]\n ",

			       escape_ssid(ssid, len), (int)len);

			       print_ssid(ssid_buf, ssid, len), (int)len);



		priv->one_direct_scan = 1;

		priv->direct_ssid_len = (u8)

drivers/net/wireless/libertas/assoc.c

+11 −6
Original line number Diff line number Diff line
@@ -153,17 +153,18 @@ static int lbs_adhoc_join(struct lbs_private *priv, 
	struct cmd_ds_802_11_ad_hoc_join cmd;

	struct bss_descriptor *bss = &assoc_req->bss;

	u8 preamble = RADIO_PREAMBLE_LONG;

	DECLARE_SSID_BUF(ssid);

	u16 ratesize = 0;

	int ret = 0;



	lbs_deb_enter(LBS_DEB_ASSOC);



	lbs_deb_join("current SSID '%s', ssid length %u\n",

		escape_ssid(priv->curbssparams.ssid,

		print_ssid(ssid, priv->curbssparams.ssid,

		priv->curbssparams.ssid_len),

		priv->curbssparams.ssid_len);

	lbs_deb_join("requested ssid '%s', ssid length %u\n",

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

		print_ssid(ssid, bss->ssid, bss->ssid_len),

		bss->ssid_len);



	/* check if the requested SSID is already joined */
@@ -308,6 +309,7 @@ static int lbs_adhoc_start(struct lbs_private *priv, 
	size_t ratesize = 0;

	u16 tmpcap = 0;

	int ret = 0;

	DECLARE_SSID_BUF(ssid);



	lbs_deb_enter(LBS_DEB_ASSOC);
@@ -327,7 +329,7 @@ static int lbs_adhoc_start(struct lbs_private *priv, 
	memcpy(cmd.ssid, assoc_req->ssid, assoc_req->ssid_len);



	lbs_deb_join("ADHOC_START: SSID '%s', ssid length %u\n",

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

		print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len),

		assoc_req->ssid_len);



	cmd.bsstype = CMD_BSS_TYPE_IBSS;
@@ -695,6 +697,7 @@ static int assoc_helper_essid(struct lbs_private *priv, 
	int ret = 0;

	struct bss_descriptor * bss;

	int channel = -1;

	DECLARE_SSID_BUF(ssid);



	lbs_deb_enter(LBS_DEB_ASSOC);
@@ -706,7 +709,7 @@ static int assoc_helper_essid(struct lbs_private *priv, 
		channel = assoc_req->channel;



	lbs_deb_assoc("SSID '%s' requested\n",

	              escape_ssid(assoc_req->ssid, assoc_req->ssid_len));

	              print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len));

	if (assoc_req->mode == IW_MODE_INFRA) {

		lbs_send_specific_ssid_scan(priv, assoc_req->ssid,

			assoc_req->ssid_len);
@@ -1207,6 +1210,7 @@ void lbs_association_worker(struct work_struct *work) 
	struct assoc_request * assoc_req = NULL;

	int ret = 0;

	int find_any_ssid = 0;

	DECLARE_SSID_BUF(ssid);



	lbs_deb_enter(LBS_DEB_ASSOC);
@@ -1230,7 +1234,7 @@ void lbs_association_worker(struct work_struct *work) 
		"    secinfo:  %s%s%s\n"

		"    auth_mode: %d\n",

		assoc_req->flags,

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

		print_ssid(ssid, assoc_req->ssid, assoc_req->ssid_len),

		assoc_req->channel, assoc_req->band, assoc_req->mode,

		assoc_req->bssid,

		assoc_req->secinfo.WPAenabled ? " WPA" : "",
@@ -1767,6 +1771,7 @@ static int lbs_adhoc_post(struct lbs_private *priv, struct cmd_header *resp) 
	struct cmd_ds_802_11_ad_hoc_result *adhoc_resp;

	union iwreq_data wrqu;

	struct bss_descriptor *bss;

	DECLARE_SSID_BUF(ssid);



	lbs_deb_enter(LBS_DEB_JOIN);
@@ -1816,7 +1821,7 @@ static int lbs_adhoc_post(struct lbs_private *priv, struct cmd_header *resp) 
	wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);



	lbs_deb_join("ADHOC_RESP: Joined/started '%s', BSSID %pM, channel %d\n",

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

		     print_ssid(ssid, bss->ssid, bss->ssid_len),

		     priv->curbssparams.bssid,

		     priv->curbssparams.channel);