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

Commit 786b4557 authored by Bill Moss's avatar Bill Moss Committed by John W. Linville
Browse files

iwlwifi: fix debug messages during scanning 



direct_mask will be set when we are not associated and requesting a
direct scan. The second debug print will be confusing as priv->essid
is not set at that time and it will thus print "<hidden>" while it is
known to which AP a direct scan is requested - as previous debug message
also indicates.

Now make all debugging consistent.

Signed-off-by: default avatarBill Moss <bmoss@clemson.edu>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f5276488

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -6292,12 +6292,17 @@ static void iwl3945_bg_request_scan(struct work_struct *data) 
		       priv->direct_ssid, priv->direct_ssid_len);

		       priv->direct_ssid, priv->direct_ssid_len);

		direct_mask = 1;

		direct_mask = 1;

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

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

		IWL_DEBUG_SCAN

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

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

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

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

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

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

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

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

		direct_mask = 1;

		direct_mask = 1;

	} else

	} else {

		IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");

		direct_mask = 0;

		direct_mask = 0;

	}





	/* We don't build a direct scan probe request; the uCode will do

	/* We don't build a direct scan probe request; the uCode will do

	 * that based on the direct_mask added to each channel entry */

	 * that based on the direct_mask added to each channel entry */
@@ -6335,23 +6340,18 @@ static void iwl3945_bg_request_scan(struct work_struct *data) 
	if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR)

	if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR)

		scan->filter_flags = RXON_FILTER_PROMISC_MSK;

		scan->filter_flags = RXON_FILTER_PROMISC_MSK;





	if (direct_mask) {

	if (direct_mask)

		IWL_DEBUG_SCAN

		    ("Initiating direct scan for %s.\n",

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

		scan->channel_count =

		scan->channel_count =

			iwl3945_get_channels_for_scan(

			iwl3945_get_channels_for_scan(

				priv, band, 1, /* active */

				priv, band, 1, /* active */

				direct_mask,

				direct_mask,

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);

	} else {

	else

		IWL_DEBUG_SCAN("Initiating indirect scan.\n");

		scan->channel_count =

		scan->channel_count =

			iwl3945_get_channels_for_scan(

			iwl3945_get_channels_for_scan(

				priv, band, 0, /* passive */

				priv, band, 0, /* passive */

				direct_mask,

				direct_mask,

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);

	}





	cmd.len += le16_to_cpu(scan->tx_cmd.len) +

	cmd.len += le16_to_cpu(scan->tx_cmd.len) +

	    scan->channel_count * sizeof(struct iwl3945_scan_channel);

	    scan->channel_count * sizeof(struct iwl3945_scan_channel);

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

+6 −7
Original line number Original line Diff line number Diff line
@@ -5813,11 +5813,15 @@ static void iwl4965_bg_request_scan(struct work_struct *data) 
		       priv->direct_ssid, priv->direct_ssid_len);

		       priv->direct_ssid, priv->direct_ssid_len);

		direct_mask = 1;

		direct_mask = 1;

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

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

		IWL_DEBUG_SCAN

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

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

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

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

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

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

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

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

		direct_mask = 1;

		direct_mask = 1;

	} else {

	} else {

		IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");

		direct_mask = 0;

		direct_mask = 0;

	}

	}
@@ -5870,23 +5874,18 @@ static void iwl4965_bg_request_scan(struct work_struct *data) 
	if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR)

	if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR)

		scan->filter_flags = RXON_FILTER_PROMISC_MSK;

		scan->filter_flags = RXON_FILTER_PROMISC_MSK;





	if (direct_mask) {

	if (direct_mask)

		IWL_DEBUG_SCAN

		    ("Initiating direct scan for %s.\n",

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

		scan->channel_count =

		scan->channel_count =

			iwl4965_get_channels_for_scan(

			iwl4965_get_channels_for_scan(

				priv, band, 1, /* active */

				priv, band, 1, /* active */

				direct_mask,

				direct_mask,

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);

	} else {

	else

		IWL_DEBUG_SCAN("Initiating indirect scan.\n");

		scan->channel_count =

		scan->channel_count =

			iwl4965_get_channels_for_scan(

			iwl4965_get_channels_for_scan(

				priv, band, 0, /* passive */

				priv, band, 0, /* passive */

				direct_mask,

				direct_mask,

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);

	}





	cmd.len += le16_to_cpu(scan->tx_cmd.len) +

	cmd.len += le16_to_cpu(scan->tx_cmd.len) +

	    scan->channel_count * sizeof(struct iwl4965_scan_channel);

	    scan->channel_count * sizeof(struct iwl4965_scan_channel);