aboutsummaryrefslogtreecommitdiffstats
path: root/patches/linux-2.6.16.13/net-gso-3-fix-errorcheck.patch
blob: 0b3dfd2870e1568318d62e178efc8d36eb062716 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff -urp a/include/linux/netdevice.h b/include/linux/netdevice.h
--- a/include/linux/netdevice.h	2006-07-25 15:16:39.314333975 +0100
+++ b/include/linux/netdevice.h	2006-07-25 15:19:37.298320799 +0100
@@ -930,10 +930,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)