Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Revert "b43/b43legacy: add RFKILL_STATE_HARD_BLOCKED support"
This reverts commit bc19d6e0b74ef03a3baf035412c95192b54dfc6f, which as
Larry Finger reports causes the radio LED on his system to no longer
respond to rfkill switch events.
Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Requested-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-36
-18
drivers/net/wireless/b43/rfkill.c
-18
drivers/net/wireless/b43/rfkill.c
···
43
43
return 0;
44
44
}
45
45
46
-
/* Update the rfkill state */
47
-
static void b43_rfkill_update_state(struct b43_wldev *dev)
48
-
{
49
-
struct b43_rfkill *rfk = &(dev->wl->rfkill);
50
-
51
-
if (!dev->radio_hw_enable) {
52
-
rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
53
-
return;
54
-
}
55
-
56
-
if (!dev->phy.radio_on)
57
-
rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
58
-
else
59
-
rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
60
-
61
-
}
62
-
63
46
/* The poll callback for the hardware button. */
64
47
static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
65
48
{
···
60
77
if (unlikely(enabled != dev->radio_hw_enable)) {
61
78
dev->radio_hw_enable = enabled;
62
79
report_change = 1;
63
-
b43_rfkill_update_state(dev);
64
80
b43info(wl, "Radio hardware status changed to %s\n",
65
81
enabled ? "ENABLED" : "DISABLED");
66
82
}
-18
drivers/net/wireless/b43legacy/rfkill.c
-18
drivers/net/wireless/b43legacy/rfkill.c
···
44
44
return 0;
45
45
}
46
46
47
-
/* Update the rfkill state */
48
-
static void b43legacy_rfkill_update_state(struct b43legacy_wldev *dev)
49
-
{
50
-
struct b43legacy_rfkill *rfk = &(dev->wl->rfkill);
51
-
52
-
if (!dev->radio_hw_enable) {
53
-
rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
54
-
return;
55
-
}
56
-
57
-
if (!dev->phy.radio_on)
58
-
rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
59
-
else
60
-
rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
61
-
62
-
}
63
-
64
47
/* The poll callback for the hardware button. */
65
48
static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)
66
49
{
···
61
78
if (unlikely(enabled != dev->radio_hw_enable)) {
62
79
dev->radio_hw_enable = enabled;
63
80
report_change = 1;
64
-
b43legacy_rfkill_update_state(dev);
65
81
b43legacyinfo(wl, "Radio hardware status changed to %s\n",
66
82
enabled ? "ENABLED" : "DISABLED");
67
83
}