Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0866b03c authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org>   [2.6.32]
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 74e2bd1f

drivers/net/wireless/b43/main.c

+1 −2
Original line number Diff line number Diff line
@@ -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:

drivers/net/wireless/b43legacy/main.c

+2 −0
Original line number Diff line number Diff line
@@ -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) */
@@ -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);