iwlegacy: more priv->mutex serialization

Check status bits with mutex taken, because when we wait for mutex
unlock, status can change. Patch should also make remaining sync
commands be send with priv->mutex taken. That will prevent execute
these commands when we are currently reset firmware, what could
possibly cause troubles.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c
index 553c91b3a258c2bc212743f144af4202eff5527b..0073f923919744fefdd8af5b7610573c8ee62dc0 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-core.c
+++ b/drivers/net/wireless/iwlegacy/iwl-core.c
@@ -2429,11 +2429,13 @@ void iwl_legacy_mac_bss_info_changed(struct ieee80211_hw *hw,
 
        IWL_DEBUG_MAC80211(priv, "changes = 0x%X\n", changes);
 
-       if (!iwl_legacy_is_alive(priv))
-               return;
-
        mutex_lock(&priv->mutex);
 
+       if (!iwl_legacy_is_alive(priv)) {
+               mutex_unlock(&priv->mutex);
+               return;
+       }
+
        if (changes & BSS_CHANGED_QOS) {
                unsigned long flags;
 

diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
index cc7ebcee60e5bd6e9d49f2a1ae8c17dee1c31f21..5bdcc36f543f4314bbf2734ec936bc746880e88c 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -2748,11 +2748,12 @@ static void iwl3945_bg_init_alive_start(struct work_struct *data)
        struct iwl_priv *priv =
            container_of(data, struct iwl_priv, init_alive_start.work);
 
+       mutex_lock(&priv->mutex);
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-               return;
+               goto out;
 
-       mutex_lock(&priv->mutex);
        iwl3945_init_alive_start(priv);
+out:
        mutex_unlock(&priv->mutex);
 }
 
@@ -2761,11 +2762,12 @@ static void iwl3945_bg_alive_start(struct work_struct *data)
        struct iwl_priv *priv =
            container_of(data, struct iwl_priv, alive_start.work);
 
+       mutex_lock(&priv->mutex);
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-               return;
+               goto out;
 
-       mutex_lock(&priv->mutex);
        iwl3945_alive_start(priv);
+out:
        mutex_unlock(&priv->mutex);
 }
 
@@ -2995,10 +2997,12 @@ static void iwl3945_bg_restart(struct work_struct *data)
        } else {
                iwl3945_down(priv);
 
-               if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+               mutex_lock(&priv->mutex);
+               if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
+                       mutex_unlock(&priv->mutex);
                        return;
+               }
 
-               mutex_lock(&priv->mutex);
                __iwl3945_up(priv);
                mutex_unlock(&priv->mutex);
        }
@@ -3009,11 +3013,12 @@ static void iwl3945_bg_rx_replenish(struct work_struct *data)
        struct iwl_priv *priv =
            container_of(data, struct iwl_priv, rx_replenish);
 
+       mutex_lock(&priv->mutex);
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-               return;
+               goto out;
 
-       mutex_lock(&priv->mutex);
        iwl3945_rx_replenish(priv);
+out:
        mutex_unlock(&priv->mutex);
 }
 

diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 2da60702fab264cf13e73b30fac97fe53a334016..55851ac3add9e3b935bed010f3d0ef89bd98f4ab 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -2404,11 +2404,12 @@ static void iwl4965_bg_init_alive_start(struct work_struct *data)
        struct iwl_priv *priv =
            container_of(data, struct iwl_priv, init_alive_start.work);
 
+       mutex_lock(&priv->mutex);
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-               return;
+               goto out;
 
-       mutex_lock(&priv->mutex);
        priv->cfg->ops->lib->init_alive_start(priv);
+out:
        mutex_unlock(&priv->mutex);
 }
 
@@ -2417,11 +2418,12 @@ static void iwl4965_bg_alive_start(struct work_struct *data)
        struct iwl_priv *priv =
            container_of(data, struct iwl_priv, alive_start.work);
 
+       mutex_lock(&priv->mutex);
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-               return;
+               goto out;
 
-       mutex_lock(&priv->mutex);
        iwl4965_alive_start(priv);
+out:
        mutex_unlock(&priv->mutex);
 }
 
@@ -2471,10 +2473,12 @@ static void iwl4965_bg_restart(struct work_struct *data)
        } else {
                iwl4965_down(priv);
 
-               if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+               mutex_lock(&priv->mutex);
+               if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
+                       mutex_unlock(&priv->mutex);
                        return;
+               }
 
-               mutex_lock(&priv->mutex);
                __iwl4965_up(priv);
                mutex_unlock(&priv->mutex);
        }
@@ -2851,21 +2855,22 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
 
        IWL_DEBUG_MAC80211(priv, "enter\n");
 
+       mutex_lock(&priv->mutex);
+
        if (iwl_legacy_is_rfkill(priv))
-               goto out_exit;
+               goto out;
 
        if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
            test_bit(STATUS_SCANNING, &priv->status))
-               goto out_exit;
+               goto out;
 
        if (!iwl_legacy_is_associated_ctx(ctx))
-               goto out_exit;
+               goto out;
 
        /* channel switch in progress */
        if (priv->switch_rxon.switch_in_progress == true)
-               goto out_exit;
+               goto out;
 
-       mutex_lock(&priv->mutex);
        if (priv->cfg->ops->lib->set_channel_switch) {
 
                ch = channel->hw_value;
@@ -2921,7 +2926,6 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
        }
 out:
        mutex_unlock(&priv->mutex);
-out_exit:
        if (!priv->switch_rxon.switch_in_progress)
                ieee80211_chswitch_done(ctx->vif, false);
        IWL_DEBUG_MAC80211(priv, "leave\n");