|
@@ -6606,7 +6606,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);
|
|
@@ -6745,6 +6745,10 @@ 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);
|
|
@@ -6885,9 +6889,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");
|
|
|
}
|
|
|
|
|
@@ -7219,6 +7233,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);
|
|
@@ -7271,7 +7291,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);
|
|
|
|
|
@@ -8574,6 +8595,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... */
|