diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2010-02-03 14:33:44 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-02-08 16:50:54 -0500 |
commit | 0866b03c7d7dee8a34ffa527ecda426c0f405518 (patch) | |
tree | 7c900d796db5636e67b9feb1e2347bb4d160fa22 /drivers | |
parent | 74e2bd1fa3ae9695af566ad5a7a288898787b909 (diff) |
b43/b43legacy: Wake queues in wireless_core_start
If b43 or b43legacy are deauthenticated or disconnected, there is a
possibility that a reconnection is tried with the queues stopped in
mac80211. To prevent this, start the queues before setting
STAT_INITIALIZED.
In b43, a similar change has been in place (twice) in the
wireless_core_init() routine. Remove the duplicate and add similar
code to b43legacy.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org> [2.6.32]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index ddd15c52b346..3c5143b935f2 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -3987,6 +3987,7 @@ static int b43_wireless_core_start(struct b43_wldev *dev) | |||
3987 | } | 3987 | } |
3988 | 3988 | ||
3989 | /* We are ready to run. */ | 3989 | /* We are ready to run. */ |
3990 | ieee80211_wake_queues(dev->wl->hw); | ||
3990 | b43_set_status(dev, B43_STAT_STARTED); | 3991 | b43_set_status(dev, B43_STAT_STARTED); |
3991 | 3992 | ||
3992 | /* Start data flow (TX/RX). */ | 3993 | /* Start data flow (TX/RX). */ |
@@ -4396,8 +4397,6 @@ static int b43_wireless_core_init(struct b43_wldev *dev) | |||
4396 | 4397 | ||
4397 | ieee80211_wake_queues(dev->wl->hw); | 4398 | ieee80211_wake_queues(dev->wl->hw); |
4398 | 4399 | ||
4399 | ieee80211_wake_queues(dev->wl->hw); | ||
4400 | |||
4401 | b43_set_status(dev, B43_STAT_INITIALIZED); | 4400 | b43_set_status(dev, B43_STAT_INITIALIZED); |
4402 | 4401 | ||
4403 | out: | 4402 | out: |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 174ac6bde2b1..b4e89a35e3fb 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -2923,6 +2923,7 @@ static int b43legacy_wireless_core_start(struct b43legacy_wldev *dev) | |||
2923 | goto out; | 2923 | goto out; |
2924 | } | 2924 | } |
2925 | /* We are ready to run. */ | 2925 | /* We are ready to run. */ |
2926 | ieee80211_wake_queues(dev->wl->hw); | ||
2926 | b43legacy_set_status(dev, B43legacy_STAT_STARTED); | 2927 | b43legacy_set_status(dev, B43legacy_STAT_STARTED); |
2927 | 2928 | ||
2928 | /* Start data flow (TX/RX) */ | 2929 | /* Start data flow (TX/RX) */ |
@@ -3343,6 +3344,7 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev) | |||
3343 | b43legacy_security_init(dev); | 3344 | b43legacy_security_init(dev); |
3344 | b43legacy_rng_init(wl); | 3345 | b43legacy_rng_init(wl); |
3345 | 3346 | ||
3347 | ieee80211_wake_queues(dev->wl->hw); | ||
3346 | b43legacy_set_status(dev, B43legacy_STAT_INITIALIZED); | 3348 | b43legacy_set_status(dev, B43legacy_STAT_INITIALIZED); |
3347 | 3349 | ||
3348 | b43legacy_leds_init(dev); | 3350 | b43legacy_leds_init(dev); |