[PATCH] net: Silence a W=1 compiler warning
From: Bart Van Assche <bvanassche@acm.org>
Date: 2014-06-13 14:12:51
Subsystem:
networking drivers, networking [general], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Avoid that the following compiler warning is reported when building
with W=1:
include/linux/netdevice.h: In function 'netif_addr_lock_nested':
include/linux/netdevice.h:2865:6: warning: variable 'subclass' set but not used [-Wunused-but-set-variable]
int subclass = SINGLE_DEPTH_NESTING;
^
This patch does not change any functionality.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Vlad Yasevich <redacted>
Cc: David S. Miller <davem@davemloft.net>
---
include/linux/netdevice.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index abe3de1..3c0a2e7 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h@@ -2951,12 +2951,10 @@ static inline void netif_addr_lock(struct net_device *dev) static inline void netif_addr_lock_nested(struct net_device *dev) { - int subclass = SINGLE_DEPTH_NESTING; - - if (dev->netdev_ops->ndo_get_lock_subclass) - subclass = dev->netdev_ops->ndo_get_lock_subclass(dev); - - spin_lock_nested(&dev->addr_list_lock, subclass); + spin_lock_nested(&dev->addr_list_lock, + dev->netdev_ops->ndo_get_lock_subclass ? + dev->netdev_ops->ndo_get_lock_subclass(dev) : + SINGLE_DEPTH_NESTING); } static inline void netif_addr_lock_bh(struct net_device *dev)
--
1.8.4.5