---

yaml --- r: 36533 b: refs/heads/master c: a67ab2b h: refs/heads/master i: 36531: 1470f28 v: v3
git-mirror · Sep 25, 2006 · 2ead13e · 2ead13e
1 parent 1f9b1c5
commit 2ead13e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 583afd1e4f25c87000c85ad7d03f5299fd4155dc
+refs/heads/master: a67ab2bde752b26be75d4b68ecead9a14692eac5
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3170,8 +3170,7 @@ static void bcm43xx_periodic_work_handler(void *d)
 		 * be preemtible.
 		 */
 		mutex_lock(&bcm->mutex);
-		netif_stop_queue(bcm->net_dev);
-		synchronize_net();
+		netif_tx_disable(bcm->net_dev);
 		spin_lock_irqsave(&bcm->irq_lock, flags);
 		bcm43xx_mac_suspend(bcm);
 		if (bcm43xx_using_pio(bcm))