summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2010-02-03 13:33:44 -0600
committerJohn W. Linville <linville@tuxdriver.com>2010-02-08 16:50:54 -0500
commit0866b03c7d7dee8a34ffa527ecda426c0f405518 (patch)
tree7c900d796db5636e67b9feb1e2347bb4d160fa22 /drivers/net/wireless/b43
parent74e2bd1fa3ae9695af566ad5a7a288898787b909 (diff)
downloadblackbird-op-linux-0866b03c7d7dee8a34ffa527ecda426c0f405518.tar.gz
blackbird-op-linux-0866b03c7d7dee8a34ffa527ecda426c0f405518.zip
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/net/wireless/b43')
-rw-r--r--drivers/net/wireless/b43/main.c3
1 files changed, 1 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)
}
/* We are ready to run. */
+ ieee80211_wake_queues(dev->wl->hw);
b43_set_status(dev, B43_STAT_STARTED);
/* Start data flow (TX/RX). */
@@ -4396,8 +4397,6 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
ieee80211_wake_queues(dev->wl->hw);
- ieee80211_wake_queues(dev->wl->hw);
-
b43_set_status(dev, B43_STAT_INITIALIZED);
out:
OpenPOWER on IntegriCloud