[PATCH 08/12] netdev: use for_each_if

Daniel Vetter daniel.vetter at ffwll.ch
Mon Jul 9 08:36:46 UTC 2018


Avoids complaints from gcc about ambiguous else clauses.

Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: netdev at vger.kernel.org
---
 include/linux/netdevice.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3ec9850c7936..cdffe7f88dbe 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2476,7 +2476,7 @@ extern rwlock_t				dev_base_lock;		/* Device list lock */
 	list_for_each_entry_continue_rcu(d, &(net)->dev_base_head, dev_list)
 #define for_each_netdev_in_bond_rcu(bond, slave)	\
 		for_each_netdev_rcu(&init_net, slave)	\
-			if (netdev_master_upper_dev_get_rcu(slave) == (bond))
+			for_each_if (netdev_master_upper_dev_get_rcu(slave) == (bond))
 #define net_device_entry(lh)	list_entry(lh, struct net_device, dev_list)
 
 static inline struct net_device *next_net_device(struct net_device *dev)
-- 
2.18.0



More information about the dri-devel mailing list