Commit 085fbca2 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: allow probe-after-rx on 2.4 GHz 

There are two passive 2.4 GHz channels: 12 and 13.
If you have a hidden SSID on those, you will not
be able to connect to it because we don't send out
probe requests there. We can allow this by using
the firmware's probe-after-rx functionality on
those channels as well.

This fixes
https://bugzilla.kernel.org/show_bug.cgi?id=16462



Reported-by: default avatarDaniel J Blueman <daniel.blueman@gmail.com>
Tested-by: default avatarDaniel J Blueman <daniel.blueman@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent de05ead8

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+20 −20
Original line number Diff line number Diff line
@@ -1447,10 +1447,15 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
		if (priv->cfg->bt_params &&

		    priv->cfg->bt_params->advanced_bt_coexist)

			scan->tx_cmd.tx_flags |= TX_CMD_FLG_IGNORE_BT;

		scan->good_CRC_th = IWL_GOOD_CRC_TH_DISABLED;

		break;

	case IEEE80211_BAND_5GHZ:

		rate = IWL_RATE_6M_PLCP;

		break;

	default:

		IWL_WARN(priv, "Invalid scan band\n");

		return -EIO;

	}



	/*

	 * If active scanning is requested but a certain channel is

	 * marked passive, we can do active scanning if we detect
@@ -1470,11 +1475,6 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	 */

	scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :

					IWL_GOOD_CRC_TH_NEVER;

		break;

	default:

		IWL_WARN(priv, "Invalid scan band\n");

		return -EIO;

	}



	band = priv->scan_band;

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

+8 −8
Original line number Diff line number Diff line
@@ -2938,11 +2938,17 @@ int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	case IEEE80211_BAND_2GHZ:

		scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;

		scan->tx_cmd.rate = IWL_RATE_1M_PLCP;

		scan->good_CRC_th = 0;

		band = IEEE80211_BAND_2GHZ;

		break;

	case IEEE80211_BAND_5GHZ:

		scan->tx_cmd.rate = IWL_RATE_6M_PLCP;

		band = IEEE80211_BAND_5GHZ;

		break;

	default:

		IWL_WARN(priv, "Invalid scan band\n");

		return -EIO;

	}



	/*

	 * If active scaning is requested but a certain channel

	 * is marked passive, we can do active scanning if we
@@ -2950,12 +2956,6 @@ int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	 */

	scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :

					IWL_GOOD_CRC_TH_DISABLED;

		band = IEEE80211_BAND_5GHZ;

		break;

	default:

		IWL_WARN(priv, "Invalid scan band\n");

		return -EIO;

	}



	if (!priv->is_internal_short_scan) {

		scan->tx_cmd.len = cpu_to_le16(

CRA Git | Maintained and supported by SUSTech CRA and CCSE