android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b43legacy: rewrite and fix rfkill initialization

Browse Source 
The rfkill subsystem doesn't like code like that
rfkill_allocate();
rfkill_register();
rfkill_unregister();
rfkill_register(); /* <- This will crash */

This sequence happens with
modprobe b43
ifconfig wlanX up
ifconfig wlanX down
ifconfig wlanX up

Fix this by always re-allocating the rfkill stuff before register.

The patch to b43 by Michael Buesch <mb@bu3sch.de> has been ported to
b43legacy.

Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stefano Brivio 2007-11-06 22:48:45 +01:00 committed by David S. Miller
parent 33a3dc9328
commit db9683fb19
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/b43legacy/main.c
View File

@ -3384,7 +3384,6 @@ static int b43legacy_setup_modes(struct b43legacy_wldev *dev,
static void b43legacy_wireless_core_detach(struct b43legacy_wldev *dev) static void b43legacy_wireless_core_detach(struct b43legacy_wldev *dev)
{ {
b43legacy_rfkill_free(dev);
/* We release firmware that late to not be required to re-request /* We release firmware that late to not be required to re-request
* is all the time when we reinit the core. */ * is all the time when we reinit the core. */
b43legacy_release_firmware(dev); b43legacy_release_firmware(dev);
@ -3466,7 +3465,6 @@ static int b43legacy_wireless_core_attach(struct b43legacy_wldev *dev)
if (!wl->current_dev) if (!wl->current_dev)
wl->current_dev = dev; wl->current_dev = dev;
INIT_WORK(&dev->restart_work, b43legacy_chip_reset); INIT_WORK(&dev->restart_work, b43legacy_chip_reset);
b43legacy_rfkill_alloc(dev);
b43legacy_radio_turn_off(dev, 1); b43legacy_radio_turn_off(dev, 1);
b43legacy_switch_analog(dev, 0); b43legacy_switch_analog(dev, 0);

16
drivers/net/wireless/b43legacy/rfkill.c
View File

@ -48,18 +48,21 @@ static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)
struct b43legacy_wldev *dev = poll_dev->private; struct b43legacy_wldev *dev = poll_dev->private;
struct b43legacy_wl *wl = dev->wl; struct b43legacy_wl *wl = dev->wl;
bool enabled; bool enabled;
bool report_change = 0;
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
B43legacy_WARN_ON(b43legacy_status(dev) < B43legacy_STAT_INITIALIZED); B43legacy_WARN_ON(b43legacy_status(dev) < B43legacy_STAT_INITIALIZED);
enabled = b43legacy_is_hw_radio_enabled(dev); enabled = b43legacy_is_hw_radio_enabled(dev);
if (unlikely(enabled != dev->radio_hw_enable)) { if (unlikely(enabled != dev->radio_hw_enable)) {
dev->radio_hw_enable = enabled; dev->radio_hw_enable = enabled;
report_change = 1;
b43legacyinfo(wl, "Radio hardware status changed to %s\n", b43legacyinfo(wl, "Radio hardware status changed to %s\n",
enabled ? "ENABLED" : "DISABLED"); enabled ? "ENABLED" : "DISABLED");
mutex_unlock(&wl->mutex); }
mutex_unlock(&wl->mutex);
if (unlikely(report_change))
input_report_key(poll_dev->input, KEY_WLAN, enabled); input_report_key(poll_dev->input, KEY_WLAN, enabled);
} else
mutex_unlock(&wl->mutex);
} }
/* Called when the RFKILL toggled in software. /* Called when the RFKILL toggled in software.
@ -70,10 +73,11 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state)
struct b43legacy_wl *wl = dev->wl; struct b43legacy_wl *wl = dev->wl;
int err = 0; int err = 0;
mutex_lock(&wl->mutex); if (!wl->rfkill.registered)
if (b43legacy_status(dev) < B43legacy_STAT_INITIALIZED) return 0;
goto out_unlock;
mutex_lock(&wl->mutex);
B43legacy_WARN_ON(b43legacy_status(dev) < B43legacy_STAT_INITIALIZED);
switch (state) { switch (state) {
case RFKILL_STATE_ON: case RFKILL_STATE_ON:
if (!dev->radio_hw_enable) { if (!dev->radio_hw_enable) {

8
drivers/net/wireless/b43legacy/rfkill.h
View File

@ -16,14 +16,14 @@ struct b43legacy_rfkill {
struct rfkill *rfkill; struct rfkill *rfkill;
/* The poll device for the RFKILL input button */ /* The poll device for the RFKILL input button */
struct input_polled_dev *poll_dev; struct input_polled_dev *poll_dev;
/* Did initialization succeed? Used for freeing. */
bool registered;
/* The unique name of this rfkill switch */ /* The unique name of this rfkill switch */
char name[32]; char name[sizeof("b43legacy-phy4294967295")];
}; };
/* All the init functions return void, because we are not interested /* The init function returns void, because we are not interested
* in failing the b43 init process when rfkill init failed. */ * in failing the b43 init process when rfkill init failed. */
void b43legacy_rfkill_alloc(struct b43legacy_wldev *dev);
void b43legacy_rfkill_free(struct b43legacy_wldev *dev);
void b43legacy_rfkill_init(struct b43legacy_wldev *dev); void b43legacy_rfkill_init(struct b43legacy_wldev *dev);
void b43legacy_rfkill_exit(struct b43legacy_wldev *dev); void b43legacy_rfkill_exit(struct b43legacy_wldev *dev);