From 2ead13ea8e3d6d9a21b0b61b1132a87846a2f4d1 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 14 Sep 2006 08:28:54 -0500 Subject: [PATCH] --- yaml --- r: 36533 b: refs/heads/master c: a67ab2bde752b26be75d4b68ecead9a14692eac5 h: refs/heads/master i: 36531: 1470f2860a4b1e0d492de5ec7274455c46d5cee6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cdf26ec7b259..c06ed4679f77 100644 --- 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 index b02e50d2ca32..eb65db7393ba 100644 --- 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))