[PATCH] bcm43xx: fix netdev watchdog timeouts

[PATCH] bcm43xx: fix netdev watchdog timeouts

[Larry Finger]

The setup for running long periodic work has a bug that leads to
netdev watchdog tx timeouts. This change eliminates the timeouts.
systems.

Signed-off-by: Michael Buesch <mb-fseUSCV1ubazQB+pC5nmwQ@public.gmane.org>
Acked-by: Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
---

John,

Please apply this to wireless-2.6. It would be great if this patch were to be
included in 2.6.19.

Thanks,

Larry

Index: wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3169,8 +3169,7 @@ static void bcm43xx_periodic_work_handle
 		 * 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))

Re: [PATCH] bcm43xx: fix netdev watchdog timeouts

[Erik Mouw]

On Thu, Sep 14, 2006 at 08:28:54AM -0500, Larry Finger wrote:
> Please apply this to wireless-2.6. It would be great if this patch were to be
> included in 2.6.19.

I suppose you mean 2.6.18?

It would also be nice if your "bcm43xx locks up machine" patch were to
be included in 2.6.18 together with this patch or we will see
regression reports against 2.6.17.


Erik

-- 
+-- Erik Mouw -- www.harddisk-recovery.com -- +31 70 370 12 90 --
| Lab address: Delftechpark 26, 2628 XH, Delft, The Netherlands

Re: [PATCH] bcm43xx: fix netdev watchdog timeouts

[Larry Finger]

Erik Mouw wrote:
> On Thu, Sep 14, 2006 at 08:28:54AM -0500, Larry Finger wrote:
>> Please apply this to wireless-2.6. It would be great if this patch were to be
>> included in 2.6.19.
> 
> I suppose you mean 2.6.18?
> 
> It would also be nice if your "bcm43xx locks up machine" patch were to
> be included in 2.6.18 together with this patch or we will see
> regression reports against 2.6.17.

This section in wireless 2.6 already differed by quite a bit from that in 
2.6.18-rcX. As a result, John Linville thinks that applying this patch to 2.6.18 
would lead to messiness in the git trees and has recommended that I hold the 
patch until it can be sent to the stable maintainers for inclusion in 2.6.18.y. 
Yes there will be a regression against 2.6.17.

Larry