Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edb34228 authored Dec 11, 2008 by Mohamed Abbas Committed by John W. Linville Dec 12, 2008

iwlwifi: fix resume while txpower off



This patch take care of coming out rfkill when the driver is up while
rfkill is on by restarting interface.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 3d5717ad

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1402,8 +1402,11 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
		* the driver as well won't allow loading if RFKILL is set
		* therefore no need to restart the driver from this handler
		*/
		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status))
		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
		clear_bit(STATUS_RF_KILL_HW, &priv->status);
		if (priv->is_open && !iwl_is_rfkill(priv))
		queue_work(priv->workqueue, &priv->up);
		}

		handled \|= CSR_INT_BIT_RF_KILL;
		}

drivers/net/wireless/iwlwifi/iwl-core.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1446,6 +1446,16 @@ int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv)
		return 0;
		}

		/* when driver is up while rfkill is on, it wont receive
		* any CARD_STATE_NOTIFICATION notifications so we have to
		* restart it in here
		*/
		if (priv->is_open && !test_bit(STATUS_ALIVE, &priv->status)) {
		clear_bit(STATUS_RF_KILL_SW, &priv->status);
		if (!iwl_is_rfkill(priv))
		queue_work(priv->workqueue, &priv->up);
		}

		/* If the driver is already loaded, it will receive
		* CARD_STATE_NOTIFICATION notifications and the handler will
		* call restart to reload the driver.