---

yaml --- r: 32791 b: refs/heads/master c: 53c4b2c h: refs/heads/master i: 32789: bf86902 32787: bf8ab44 32783: e24275c v: v3
git-mirror · Jul 21, 2006 · b903f6d · b903f6d
1 parent a3019b4
commit b903f6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf9915cc55cb8d18d4e3a8de3d1578a9af4a2e8b
+refs/heads/master: 53c4b2cc7a05c034fd21d104d2ab43ea8cc0e075
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -924,10 +924,10 @@ static inline void netif_tx_lock_bh(struct net_device *dev)
 
 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)