Commit a9efa652 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: clean up HW RF-kill state machine and restarts 



This patch cleans up HW RF-kill state machine.

Signed-off-by: default avatarMohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 154b25ce

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

+12 −3
Original line number Diff line number Diff line
@@ -1407,6 +1407,13 @@ int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv) 
	spin_lock_irqsave(&priv->lock, flags);

	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);



	/* If the driver is up it will receive CARD_STATE_NOTIFICATION

	 * notification where it will clear SW rfkill status.

	 * Setting it here would break the handler. Only if the

	 * interface is down we can set here since we don't

	 * receive any further notification.

	 */

	if (!priv->is_open)

		clear_bit(STATUS_RF_KILL_SW, &priv->status);

	spin_unlock_irqrestore(&priv->lock, flags);
@@ -1425,8 +1432,10 @@ int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv) 
		return 0;

	}



	if (priv->is_open)

		queue_work(priv->workqueue, &priv->restart);

	/* If the driver is already loaded, it will receive

	 * CARD_STATE_NOTIFICATION notifications and the handler will

	 * call restart to reload the driver.

	 */

	return 1;

}

EXPORT_SYMBOL(iwl_radio_kill_sw_enable_radio);

drivers/net/wireless/iwlwifi/iwl4965-base.c

+5 −7
Original line number Diff line number Diff line
@@ -1606,14 +1606,12 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv) 
		IWL_DEBUG(IWL_DL_RF_KILL, "RF_KILL bit toggled to %s.\n",

				hw_rf_kill ? "disable radio":"enable radio");



		/* Queue restart only if RF_KILL switch was set to "kill"

		 *   when we loaded driver, and is now set to "enable".

		 * After we're Alive, RF_KILL gets handled by

		 *   iwl4965_rx_card_state_notif() */

		if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {

		/* driver only loads ucode once setting the interface up.

		 * 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))

			clear_bit(STATUS_RF_KILL_HW, &priv->status);

			queue_work(priv->workqueue, &priv->restart);

		}



		handled |= CSR_INT_BIT_RF_KILL;

	}