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

Commit 73077c85 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Fix RFKILL polling 



The rfkill_poll callback function in the drivers check a bit
to see if the RFKILL key has been pressed. However when the
bit is set it means the radio is active and the device can be
used.

The wiphy_rfkill_set_hw_state() function expects the inversed,
so '1' must be send when the radio must be disabled.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5f1c07d9

drivers/net/wireless/rt2x00/rt2x00mac.c

+2 −2
Original line number Diff line number Diff line
@@ -704,8 +704,8 @@ EXPORT_SYMBOL_GPL(rt2x00mac_conf_tx); 
void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw)

{

	struct rt2x00_dev *rt2x00dev = hw->priv;

	bool blocked = !!rt2x00dev->ops->lib->rfkill_poll(rt2x00dev);

	bool active = !!rt2x00dev->ops->lib->rfkill_poll(rt2x00dev);



	wiphy_rfkill_set_hw_state(hw->wiphy, blocked);

	wiphy_rfkill_set_hw_state(hw->wiphy, !active);

}

EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll);