aboutsummaryrefslogtreecommitdiffstats
path: root/patches/linux-2.6.17/net-gso-3-fix-errorcheck.patch
blob: 080fba449b43d5d8acedadbd599e30b5cc3ce804 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff -pruN ../orig-linux-2.6.17/include/linux/netdevice.h ./include/linux/netdevice.h
--- ../orig-linux-2.6.17/include/linux/netdevice.h	2007-01-08 15:25:03.000000000 +0000
+++ ./include/linux/netdevice.h	2007-01-08 15:27:08.000000000 +0000
@@ -919,10 +919,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)