Commit 55a3757a authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville

iwlwifi: change check triggering device restart after rfkill change

The STATUS_ALIVE value cannot be used because it is cleared when
interface is brought down and will not be set if rfkill is enabled when
interface is started again. The interface can thus not be brought up if
rfkill was enabled before stopping the interface and disabled after
starting the interface.

Change the test to use priv->is_open instead, this will be set when
interface is started whether rfkill is enabled or not.

Thanks to Helmut Schaa for the suggested fix.
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 71a7b26d
...@@ -2054,7 +2054,7 @@ void iwl_bg_rf_kill(struct work_struct *work) ...@@ -2054,7 +2054,7 @@ void iwl_bg_rf_kill(struct work_struct *work)
"HW and/or SW RF Kill no longer active, restarting " "HW and/or SW RF Kill no longer active, restarting "
"device\n"); "device\n");
if (!test_bit(STATUS_EXIT_PENDING, &priv->status) && if (!test_bit(STATUS_EXIT_PENDING, &priv->status) &&
test_bit(STATUS_ALIVE, &priv->status)) priv->is_open)
queue_work(priv->workqueue, &priv->restart); queue_work(priv->workqueue, &priv->restart);
} else { } else {
/* make sure mac80211 stop sending Tx frame */ /* make sure mac80211 stop sending Tx frame */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment