[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <E1G3E0V-0006e2-00@gondolin.me.apana.org.au>
Date: Thu, 20 Jul 2006 01:30:39 +1000
From: Herbert Xu <herbert@...dor.apana.org.au>
To: davem@...emloft.net, ruben@...ttmann.net (Ruben Puettmann)
Cc: sergio@...giomb.no-ip.org, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org
Subject: Re: 2.6.18-rc2 tg3 Dead loop on netdevice eth0 fix it urgently!
Ruben Puettmann <ruben@...ttmann.net> wrote:
>
> Yes But in the moment I thing I have not enough informations.
Oops, it was a thinko on my part.
[NET]: Fix reversed error test in netif_tx_trylock
A non-zero return value indicates success from spin_trylock,
not error.
Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au>
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 76cc099..75f02d8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -924,10 +924,10 @@ static inline void netif_tx_lock_bh(stru
static inline int netif_tx_trylock(struct net_device *dev)
{
- int err = spin_trylock(&dev->_xmit_lock);
- if (!err)
+ int ok = spin_trylock(&dev->_xmit_lock);
+ if (likely(ok))
dev->xmit_lock_owner = smp_processor_id();
- return err;
+ return ok;
}
static inline void netif_tx_unlock(struct net_device *dev)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists