ia64/xen-unstable

view patches/linux-2.6.16.29/net-gso-3-fix-errorcheck.patch @ 12273:b223ba940ed1

PV-on-HVM: Fix PV-on-HVM drivers need maddr.h included for defn of maddr_t.
Signed-off-by: Takanori Kasai <Kasai.Takanori@jp.fujitsu.com>
Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
author kfraser@localhost.localdomain
date Tue Nov 07 09:29:53 2006 +0000 (2006-11-07)
parents 041be3f6b38e
children
line source
1 diff -pruN ../orig-linux-2.6.16.29/include/linux/netdevice.h ./include/linux/netdevice.h
2 --- ../orig-linux-2.6.16.29/include/linux/netdevice.h 2006-09-19 13:59:46.000000000 +0100
3 +++ ./include/linux/netdevice.h 2006-09-19 14:05:28.000000000 +0100
4 @@ -930,10 +930,10 @@ static inline void netif_tx_lock_bh(stru
6 static inline int netif_tx_trylock(struct net_device *dev)
7 {
8 - int err = spin_trylock(&dev->_xmit_lock);
9 - if (!err)
10 + int ok = spin_trylock(&dev->_xmit_lock);
11 + if (likely(ok))
12 dev->xmit_lock_owner = smp_processor_id();
13 - return err;
14 + return ok;
15 }
17 static inline void netif_tx_unlock(struct net_device *dev)