Skip to content

Commit

Permalink
b43/b43legacy: Wake queues in wireless_core_start
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Larry Finger authored and John W. Linville committed Feb 8, 2010
1 parent 74e2bd1 commit 0866b03
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/wireless/b43/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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). */
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/b43legacy/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2923,6 +2923,7 @@ static int b43legacy_wireless_core_start(struct b43legacy_wldev *dev)
goto out;
}
/* We are ready to run. */
ieee80211_wake_queues(dev->wl->hw);
b43legacy_set_status(dev, B43legacy_STAT_STARTED);

/* Start data flow (TX/RX) */
Expand Down Expand Up @@ -3343,6 +3344,7 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev)
b43legacy_security_init(dev);
b43legacy_rng_init(wl);

ieee80211_wake_queues(dev->wl->hw);
b43legacy_set_status(dev, B43legacy_STAT_INITIALIZED);

b43legacy_leds_init(dev);
Expand Down

0 comments on commit 0866b03

Please sign in to comment.