From: Herbert Xu Date: Fri, 21 Jul 2006 21:55:38 +0000 (-0700) Subject: [NET]: Fix reversed error test in netif_tx_trylock X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=53c4b2cc7a05c034fd21d104d2ab43ea8cc0e075;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git [NET]: Fix reversed error test in netif_tx_trylock A non-zero return value indicates success from spin_trylock, not error. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller --- diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 76cc099c858..75f02d8c6ed 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) 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)