ia64/xen-unstable

annotate patches/linux-2.6.16.13/net-gso-3-fix-errorcheck.patch @ 11114:5a454f6e320f

Make room in e820map for SMBIOS tables.
Signed-off-by: Andrew D. Ball <aball@us.ibm.com>
author kfraser@localhost.localdomain
date Mon Aug 14 17:29:11 2006 +0100 (2006-08-14)
parents 7dfc65c38035
children
rev   line source
kfraser@10781 1 diff -urp a/include/linux/netdevice.h b/include/linux/netdevice.h
kfraser@10781 2 --- a/include/linux/netdevice.h 2006-07-25 15:16:39.314333975 +0100
kfraser@10781 3 +++ b/include/linux/netdevice.h 2006-07-25 15:19:37.298320799 +0100
kfraser@10781 4 @@ -930,10 +930,10 @@ static inline void netif_tx_lock_bh(stru
kfraser@10781 5
kfraser@10781 6 static inline int netif_tx_trylock(struct net_device *dev)
kfraser@10781 7 {
kfraser@10781 8 - int err = spin_trylock(&dev->_xmit_lock);
kfraser@10781 9 - if (!err)
kfraser@10781 10 + int ok = spin_trylock(&dev->_xmit_lock);
kfraser@10781 11 + if (likely(ok))
kfraser@10781 12 dev->xmit_lock_owner = smp_processor_id();
kfraser@10781 13 - return err;
kfraser@10781 14 + return ok;
kfraser@10781 15 }
kfraser@10781 16
kfraser@10781 17 static inline void netif_tx_unlock(struct net_device *dev)