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: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 12 insertions, 22 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a130f5d077f0..4aaced0b9f26 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -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) {
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index d362c4c82db2..5005c9513007 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -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) {