direct-io.hg

annotate patches/linux-2.6.16.33/net-gso-3-fix-errorcheck.patch @ 12988:e080700efa56

[TOOLS] Fix the build. Clearly demarcate PPC-specific stuff.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Wed Dec 13 10:23:53 2006 +0000 (2006-12-13)
parents 6c2c7ff6265a
children
rev   line source
ian@12592 1 diff -pruN ../orig-linux-2.6.16.29/include/linux/netdevice.h ./include/linux/netdevice.h
ian@12592 2 --- ../orig-linux-2.6.16.29/include/linux/netdevice.h 2006-09-19 13:59:46.000000000 +0100
ian@12592 3 +++ ./include/linux/netdevice.h 2006-09-19 14:05:28.000000000 +0100
ian@12592 4 @@ -930,10 +930,10 @@ static inline void netif_tx_lock_bh(stru
ian@12592 5
ian@12592 6 static inline int netif_tx_trylock(struct net_device *dev)
ian@12592 7 {
ian@12592 8 - int err = spin_trylock(&dev->_xmit_lock);
ian@12592 9 - if (!err)
ian@12592 10 + int ok = spin_trylock(&dev->_xmit_lock);
ian@12592 11 + if (likely(ok))
ian@12592 12 dev->xmit_lock_owner = smp_processor_id();
ian@12592 13 - return err;
ian@12592 14 + return ok;
ian@12592 15 }
ian@12592 16
ian@12592 17 static inline void netif_tx_unlock(struct net_device *dev)