diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
| commit | b71426eb10d904d421b36f51f93c8d0ba558edac (patch) | |
| tree | a8c7088a6b89499134e01750652aa55f2baa890f /include/linux/netdevice.h | |
| parent | 8419dc8a34d765f2ff1aa4051084d54cfeff09cf (diff) | |
| parent | abb5a5cc6bba1516403146c5b79036fe843beb70 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 76cc099c8580..75f02d8c6ed3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -924,10 +924,10 @@ static inline void netif_tx_lock_bh(struct net_device *dev) | |||
| 924 | 924 | ||
| 925 | static inline int netif_tx_trylock(struct net_device *dev) | 925 | static inline int netif_tx_trylock(struct net_device *dev) |
| 926 | { | 926 | { |
| 927 | int err = spin_trylock(&dev->_xmit_lock); | 927 | int ok = spin_trylock(&dev->_xmit_lock); |
| 928 | if (!err) | 928 | if (likely(ok)) |
| 929 | dev->xmit_lock_owner = smp_processor_id(); | 929 | dev->xmit_lock_owner = smp_processor_id(); |
| 930 | return err; | 930 | return ok; |
| 931 | } | 931 | } |
| 932 | 932 | ||
| 933 | static inline void netif_tx_unlock(struct net_device *dev) | 933 | static inline void netif_tx_unlock(struct net_device *dev) |