From b903f6da7965a24e4707b878864904896cbea1e4 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 21 Jul 2006 14:55:38 -0700 Subject: [PATCH] --- yaml --- r: 32791 b: refs/heads/master c: 53c4b2cc7a05c034fd21d104d2ab43ea8cc0e075 h: refs/heads/master i: 32789: bf86902bf2ad25ec5f31ae09c05c202104b92823 32787: bf8ab44897ec8ae9260ae25c8c1b19a7bcc8feb8 32783: e24275c3568c4d4a8828527ce44f4c12c7753d98 v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7bd8ef62c09a..cc1983796f08 100644 --- 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 index 76cc099c8580..75f02d8c6ed3 100644 --- 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)