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

Commit 3dc3374f authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: pcie: don't update the op_mode if rfkill hasn't changed 



This is useless and introduces a dependency between rfkill
and stop_device - the op_mode can't call stop_device from
the rfkill notification since it would lead to an endless
recursion.
Next patches will need to do so.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent b9439491

drivers/net/wireless/iwlwifi/pcie/trans.c

+11 −2
Original line number Original line Diff line number Diff line
@@ -607,7 +607,9 @@ static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans, u32 scd_addr) 
static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)

static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)

{

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	bool hw_rfkill;

	bool hw_rfkill, was_hw_rfkill;



	was_hw_rfkill = iwl_is_rfkill_set(trans);





	/* tell the device to stop sending interrupts */

	/* tell the device to stop sending interrupts */

	spin_lock(&trans_pcie->irq_lock);

	spin_lock(&trans_pcie->irq_lock);
@@ -669,12 +671,19 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans) 
	 * all the interrupts were disabled, in this case we couldn't

	 * all the interrupts were disabled, in this case we couldn't

	 * receive the RF kill interrupt and update the state in the

	 * receive the RF kill interrupt and update the state in the

	 * op_mode.

	 * op_mode.

	 * Don't call the op_mode if the rkfill state hasn't changed.

	 * This allows the op_mode to call stop_device from the rfkill

	 * notification without endless recursion. Under very rare

	 * circumstances, we might have a small recursion if the rfkill

	 * state changed exactly now while we were called from stop_device.

	 * This is very unlikely but can happen and is supported.

	 */

	 */

	hw_rfkill = iwl_is_rfkill_set(trans);

	hw_rfkill = iwl_is_rfkill_set(trans);

	if (hw_rfkill)

	if (hw_rfkill)

		set_bit(STATUS_RFKILL, &trans->status);

		set_bit(STATUS_RFKILL, &trans->status);

	else

	else

		clear_bit(STATUS_RFKILL, &trans->status);

		clear_bit(STATUS_RFKILL, &trans->status);

	if (hw_rfkill != was_hw_rfkill)

		iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);

		iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);

}

}