Commit 53c4b2cc authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

[NET]: Fix reversed error test in netif_tx_trylock

A non-zero return value indicates success from spin_trylock,
not error.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf9915cc
...@@ -924,10 +924,10 @@ static inline void netif_tx_lock_bh(struct net_device *dev) ...@@ -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) static inline int netif_tx_trylock(struct net_device *dev)
{ {
int err = spin_trylock(&dev->_xmit_lock); int ok = spin_trylock(&dev->_xmit_lock);
if (!err) if (likely(ok))
dev->xmit_lock_owner = smp_processor_id(); dev->xmit_lock_owner = smp_processor_id();
return err; return ok;
} }
static inline void netif_tx_unlock(struct net_device *dev) static inline void netif_tx_unlock(struct net_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment