1 files changed, 48 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 5e1279263b2..d60adcb9bd4 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -6845,8 +6845,9 @@ static void iwl_bg_scan_check(struct work_struct *data)
                 IWL_DEBUG(IWL_DL_INFO | IWL_DL_SCAN,
                           "Scan completion watchdog resetting adapter (%dms)\n",
                           jiffies_to_msecs(IWL_SCAN_CHECK_WATCHDOG));
+
                 if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
-                        queue_work(priv->workqueue, &priv->restart);
+                        iwl_send_scan_abort(priv);
         }
         mutex_unlock(&priv->mutex);
 }
@@ -6942,7 +6943,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
                 spin_unlock_irqrestore(&priv->lock, flags);
 
                 scan->suspend_time = 0;
-                scan->max_out_time = cpu_to_le32(600 * 1024);
+                scan->max_out_time = cpu_to_le32(200 * 1024);
                 if (!interval)
                         interval = suspend_time;
 
@@ -6965,7 +6966,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
                 memcpy(scan->direct_scan[0].ssid,
                        priv->direct_ssid, priv->direct_ssid_len);
                 direct_mask = 1;
-        } else if (!iwl_is_associated(priv)) {
+        } else if (!iwl_is_associated(priv) && 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);
@@ -7118,6 +7119,12 @@ static void iwl_bg_post_associate(struct work_struct *data)
 
         mutex_lock(&priv->mutex);
 
+        if (!priv->interface_id || !priv->is_open) {
+                mutex_unlock(&priv->mutex);
+                return;
+        }
+        iwl_scan_cancel_timeout(priv, 200);
+
         conf = ieee80211_get_hw_conf(priv->hw);
 
         priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
@@ -7271,9 +7278,19 @@ static void iwl_mac_stop(struct ieee80211_hw *hw)
         struct iwl_priv *priv = hw->priv;
 
         IWL_DEBUG_MAC80211("enter\n");
+
+
+        mutex_lock(&priv->mutex);
+        /* stop mac, cancel any scan request and clear
+         * RXON_FILTER_ASSOC_MSK BIT
+         */
         priv->is_open = 0;
-        /*netif_stop_queue(dev); */
-        flush_workqueue(priv->workqueue);
+        iwl_scan_cancel_timeout(priv, 100);
+        cancel_delayed_work(&priv->post_associate);
+        priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+        iwl_commit_rxon(priv);
+        mutex_unlock(&priv->mutex);
+
         IWL_DEBUG_MAC80211("leave\n");
 }
 
@@ -7573,8 +7590,6 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
                 if (priv->iw_mode == IEEE80211_IF_TYPE_AP)
                         iwl_config_ap(priv);
                 else {
-                        priv->staging_rxon.filter_flags |=
-                                                RXON_FILTER_ASSOC_MSK;
                         rc = iwl_commit_rxon(priv);
                         if ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && rc)
                                 iwl_rxon_add_station(
@@ -7582,6 +7597,7 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
                 }
 
         } else {
+                iwl_scan_cancel_timeout(priv, 100);
                 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
                 iwl_commit_rxon(priv);
         }
@@ -7621,6 +7637,12 @@ static void iwl_mac_remove_interface(struct ieee80211_hw *hw,
         IWL_DEBUG_MAC80211("enter\n");
 
         mutex_lock(&priv->mutex);
+
+        iwl_scan_cancel_timeout(priv, 100);
+        cancel_delayed_work(&priv->post_associate);
+        priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+        iwl_commit_rxon(priv);
+
         if (priv->interface_id == conf->if_id) {
                 priv->interface_id = 0;
                 memset(priv->bssid, 0, ETH_ALEN);
@@ -7642,6 +7664,7 @@ static int iwl_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
 
         IWL_DEBUG_MAC80211("enter\n");
 
+        mutex_lock(&priv->mutex);
         spin_lock_irqsave(&priv->lock, flags);
 
         if (!iwl_is_ready_rf(priv)) {
@@ -7672,7 +7695,8 @@ static int iwl_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
                 priv->direct_ssid_len = (u8)
                     min((u8) len, (u8) IW_ESSID_MAX_SIZE);
                 memcpy(priv->direct_ssid, ssid, priv->direct_ssid_len);
-        }
+        } else
+                priv->one_direct_scan = 0;
 
         rc = iwl_scan_initiate(priv);
 
@@ -7680,6 +7704,7 @@ static int iwl_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
 
 out_unlock:
         spin_unlock_irqrestore(&priv->lock, flags);
+        mutex_unlock(&priv->mutex);
 
         return rc;
 }
@@ -7713,6 +7738,8 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         mutex_lock(&priv->mutex);
 
+        iwl_scan_cancel_timeout(priv, 100);
+
         switch (cmd) {
         case  SET_KEY:
                 rc = iwl_update_sta_key_info(priv, key, sta_id);
@@ -7903,8 +7930,18 @@ static void iwl_mac_reset_tsf(struct ieee80211_hw *hw)
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
+        /* we are restarting association process
+         * clear RXON_FILTER_ASSOC_MSK bit
+         */
+        if (priv->iw_mode != IEEE80211_IF_TYPE_AP) {
+                iwl_scan_cancel_timeout(priv, 100);
+                priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+                iwl_commit_rxon(priv);
+        }
+
         /* Per mac80211.h: This is only used in IBSS mode... */
         if (priv->iw_mode != IEEE80211_IF_TYPE_IBSS) {
+
                 IWL_DEBUG_MAC80211("leave - not in IBSS\n");
                 mutex_unlock(&priv->mutex);
                 return;
@@ -9152,6 +9189,9 @@ static void iwl_pci_remove(struct pci_dev *pdev)
                 iwl_rate_control_unregister(priv->hw);
         }
 
+        /*netif_stop_queue(dev); */
+        flush_workqueue(priv->workqueue);
+
         /* ieee80211_unregister_hw calls iwl_mac_stop, which flushes
          * priv->workqueue... so we can't take down the workqueue
          * until now... */