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

Commit 25f94aea authored by Matthew Garrett's avatar Matthew Garrett Committed by John W. Linville
Browse files

ipw2200: Set core hw rfkill status when hardware changes state 



ipw2200 is able to detect when it's been hard-killed, but doesn't update
the core rfkill state or update userspace. Ensure that the state is updated,
allowing the rfkill core to notify userspace.

Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c26409a9

drivers/net/wireless/ipw2x00/ipw2200.c

+6 −2
Original line number Diff line number Diff line
@@ -1757,10 +1757,13 @@ static DEVICE_ATTR(direct_dword, S_IWUSR | S_IRUGO, 


static int rf_kill_active(struct ipw_priv *priv)

{

	if (0 == (ipw_read32(priv, 0x30) & 0x10000))

	if (0 == (ipw_read32(priv, 0x30) & 0x10000)) {

		priv->status |= STATUS_RF_KILL_HW;

	else

		wiphy_rfkill_set_hw_state(priv->ieee->wdev.wiphy, true);

	} else {

		priv->status &= ~STATUS_RF_KILL_HW;

		wiphy_rfkill_set_hw_state(priv->ieee->wdev.wiphy, false);

	}



	return (priv->status & STATUS_RF_KILL_HW) ? 1 : 0;

}
@@ -2043,6 +2046,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv) 
	if (inta & IPW_INTA_BIT_RF_KILL_DONE) {

		IPW_DEBUG_RF_KILL("RF_KILL_DONE\n");

		priv->status |= STATUS_RF_KILL_HW;

		wiphy_rfkill_set_hw_state(priv->ieee->wdev.wiphy, true);

		wake_up_interruptible(&priv->wait_command_queue);

		priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);

		cancel_delayed_work(&priv->request_scan);