A prior commit to fix up netdev_master_upper_dev_link for recent
kernels caused a compile warning on RHEL 7 builds.

Fixes: 36d3520b5f ("datapath: Fix netdev_master_upper_dev_link for 4.14")
Signed-off-by: Greg Rose <gvrose8...@gmail.com>
---
 datapath/linux/compat/include/linux/netdevice.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/datapath/linux/compat/include/linux/netdevice.h 
b/datapath/linux/compat/include/linux/netdevice.h
index 052689f..9d3b249 100644
--- a/datapath/linux/compat/include/linux/netdevice.h
+++ b/datapath/linux/compat/include/linux/netdevice.h
@@ -116,6 +116,7 @@ static inline int rpl_netdev_master_upper_dev_link(struct 
net_device *dev,
        return netdev_master_upper_dev_link(dev, upper_dev,
                                            upper_priv, upper_info);
 }
+#undef netdev_master_upper_dev_link
 #define netdev_master_upper_dev_link rpl_netdev_master_upper_dev_link
 #endif /* #else HAVE_NETDEV_MASTER_UPPER_DEV_LINK_RH */
 #else  /* #ifndef HAVE_NETDEV_MASTER_UPPER_DEV_LINK_PRIV */
-- 
1.8.3.1

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to