| Message ID | 1519683016-15500-2-git-send-email-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,1/2] compat: Fix RHEL 7 compile | expand |
On Mon, Feb 26, 2018 at 2:10 PM, Greg Rose <gvrose8192@gmail.com> wrote: > 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 <gvrose8192@gmail.com> I pushed both patches to master and branch-2.9. Thanks, Pravin.
On 2/27/2018 7:59 PM, Pravin Shelar wrote: > On Mon, Feb 26, 2018 at 2:10 PM, Greg Rose <gvrose8192@gmail.com> wrote: >> 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 <gvrose8192@gmail.com> > I pushed both patches to master and branch-2.9. > > Thanks, > Pravin. Thank you! - Greg
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 */
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 <gvrose8192@gmail.com> --- datapath/linux/compat/include/linux/netdevice.h | 1 + 1 file changed, 1 insertion(+)