diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2006-09-14 09:28:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-09-25 16:52:18 -0400 |
| commit | a67ab2bde752b26be75d4b68ecead9a14692eac5 (patch) | |
| tree | 5974fad766ec87f84a1d3c382acdc7fb86f4f6d7 /drivers/net | |
| parent | 583afd1e4f25c87000c85ad7d03f5299fd4155dc (diff) | |
[PATCH] bcm43xx: fix netdev watchdog timeouts
The setup for running long periodic work has a bug that leads to
netdev watchdog tx timeouts. This change eliminates the timeouts.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index b02e50d2ca32..eb65db7393ba 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
| @@ -3170,8 +3170,7 @@ static void bcm43xx_periodic_work_handler(void *d) | |||
| 3170 | * be preemtible. | 3170 | * be preemtible. |
| 3171 | */ | 3171 | */ |
| 3172 | mutex_lock(&bcm->mutex); | 3172 | mutex_lock(&bcm->mutex); |
| 3173 | netif_stop_queue(bcm->net_dev); | 3173 | netif_tx_disable(bcm->net_dev); |
| 3174 | synchronize_net(); | ||
| 3175 | spin_lock_irqsave(&bcm->irq_lock, flags); | 3174 | spin_lock_irqsave(&bcm->irq_lock, flags); |
| 3176 | bcm43xx_mac_suspend(bcm); | 3175 | bcm43xx_mac_suspend(bcm); |
| 3177 | if (bcm43xx_using_pio(bcm)) | 3176 | if (bcm43xx_using_pio(bcm)) |