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

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

iwlwifi: don't bring up interface if RF-kill avoids radio 



This patch avoids the user from bringing up the interface if RF-kill
doesn't allow radio.

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

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

+8 −6
Original line number Diff line number Diff line
@@ -2187,14 +2187,16 @@ static int __iwl4965_up(struct iwl_priv *priv) 
	if (iwl_read32(priv, CSR_GP_CNTRL) &

				CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)

		clear_bit(STATUS_RF_KILL_HW, &priv->status);

	else {

	else

		set_bit(STATUS_RF_KILL_HW, &priv->status);

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



	if (!test_bit(STATUS_IN_SUSPEND, &priv->status) &&

	    iwl_is_rfkill(priv)) {

		iwl_rfkill_set_hw_state(priv);

			IWL_WARNING("Radio disabled by HW RF Kill switch\n");

		IWL_WARNING("Radio disabled by %s RF Kill switch\n",

		    test_bit(STATUS_RF_KILL_HW, &priv->status) ? "HW" : "SW");

		return -ENODEV;

	}

	}



	iwl_rfkill_set_hw_state(priv);

	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);