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

Commit b716bb91 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: Cancel scanning upon association 



This patch cancels an ongoing HW scan upon association. Not doing this
resulted in instability in association.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4bf775cd

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

+6 −11
Original line number Diff line number Diff line
@@ -7004,6 +7004,12 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw, 
	if (conf == NULL)

		return -EIO;



	if (priv->vif != vif) {

		IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");

		mutex_unlock(&priv->mutex);

		return 0;

	}



	/* XXX: this MUST use conf->mac_addr */



	if ((priv->iw_mode == IEEE80211_IF_TYPE_AP) &&
@@ -7028,17 +7034,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw, 
	if (unlikely(test_bit(STATUS_SCANNING, &priv->status)) &&

	    !(priv->hw->flags & IEEE80211_HW_NO_PROBE_FILTERING)) {

 */

	if (unlikely(test_bit(STATUS_SCANNING, &priv->status))) {

		IWL_DEBUG_MAC80211("leave - scanning\n");

		mutex_unlock(&priv->mutex);

		return 0;

	}



	if (priv->vif != vif) {

		IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");

		mutex_unlock(&priv->mutex);

		return 0;

	}



	if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {

		if (!conf->bssid) {

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

+6 −11
Original line number Diff line number Diff line
@@ -7424,6 +7424,12 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw, 
	if (conf == NULL)

		return -EIO;



	if (priv->vif != vif) {

		IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");

		mutex_unlock(&priv->mutex);

		return 0;

	}



	if ((priv->iw_mode == IEEE80211_IF_TYPE_AP) &&

	    (!conf->beacon || !conf->ssid_len)) {

		IWL_DEBUG_MAC80211
@@ -7446,17 +7452,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw, 
	if (unlikely(test_bit(STATUS_SCANNING, &priv->status)) &&

	    !(priv->hw->flags & IEEE80211_HW_NO_PROBE_FILTERING)) {

 */

	if (unlikely(test_bit(STATUS_SCANNING, &priv->status))) {

		IWL_DEBUG_MAC80211("leave - scanning\n");

		mutex_unlock(&priv->mutex);

		return 0;

	}



	if (priv->vif != vif) {

		IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");

		mutex_unlock(&priv->mutex);

		return 0;

	}



	if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {

		if (!conf->bssid) {