Re: [patch] net: dev_watchdog() locking fix

[David Miller <davem@davemloft.net>]

From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 9 Dec 2006 10:59:52 +1100

> On Fri, Dec 08, 2006 at 03:19:02PM -0800, Andrew Morton wrote:
> > 
> > Like this?
> > 
> > 	/* don't get messages out of order, and no recursion */
> > 	if (skb_queue_len(&npinfo->txq) == 0 &&
> > 		    npinfo->poll_owner != smp_processor_id()) {
> > 		local_bh_disable();	/* Where's netif_tx_trylock_bh()? */
> > 		if (netif_tx_trylock(dev)) {
> > 			/* try until next clock tick */
> > 			for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
> > 					tries > 0; --tries) {
> > 				if (!netif_queue_stopped(dev))
> > 					status = dev->hard_start_xmit(skb, dev);
> > 
> > 				if (status == NETDEV_TX_OK)
> > 					break;
> > 
> > 				/* tickle device maybe there is some cleanup */
> > 				netpoll_poll(np);
> > 
> > 				udelay(USEC_PER_POLL);
> > 			}
> > 			netif_tx_unlock(dev);
> > 		}
> > 		local_bh_enable();
> > 	}
> 
> Looks good to me.  Thanks Andrew!

I've applied this patch, thanks a lot.