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

Commit e95926d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "b43/b43legacy: add RFKILL_STATE_HARD_BLOCKED support" 



This reverts commit bc19d6e0, which as
Larry Finger reports causes the radio LED on his system to no longer
respond to rfkill switch events.

Reported-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Requested-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bc45eb89

drivers/net/wireless/b43/rfkill.c

+0 −18
Original line number Diff line number Diff line
@@ -43,23 +43,6 @@ static bool b43_is_hw_radio_enabled(struct b43_wldev *dev) 
	return 0;

}



/* Update the rfkill state */

static void b43_rfkill_update_state(struct b43_wldev *dev)

{

	struct b43_rfkill *rfk = &(dev->wl->rfkill);



	if (!dev->radio_hw_enable) {

		rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;

		return;

	}



	if (!dev->phy.radio_on)

		rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;

	else

		rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;



}



/* The poll callback for the hardware button. */

static void b43_rfkill_poll(struct input_polled_dev *poll_dev)

{
@@ -77,7 +60,6 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev) 
	if (unlikely(enabled != dev->radio_hw_enable)) {

		dev->radio_hw_enable = enabled;

		report_change = 1;

		b43_rfkill_update_state(dev);

		b43info(wl, "Radio hardware status changed to %s\n",

			enabled ? "ENABLED" : "DISABLED");

	}

drivers/net/wireless/b43legacy/rfkill.c

+0 −18
Original line number Diff line number Diff line
@@ -44,23 +44,6 @@ static bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev) 
	return 0;

}



/* Update the rfkill state */

static void b43legacy_rfkill_update_state(struct b43legacy_wldev *dev)

{

	struct b43legacy_rfkill *rfk = &(dev->wl->rfkill);



	if (!dev->radio_hw_enable) {

		rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;

		return;

	}



	if (!dev->phy.radio_on)

		rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;

	else

		rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;



}



/* The poll callback for the hardware button. */

static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)

{
@@ -78,7 +61,6 @@ static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev) 
	if (unlikely(enabled != dev->radio_hw_enable)) {

		dev->radio_hw_enable = enabled;

		report_change = 1;

		b43legacy_rfkill_update_state(dev);

		b43legacyinfo(wl, "Radio hardware status changed to %s\n",

			enabled ? "ENABLED" : "DISABLED");

	}