On Mon, Jul 18, 2016 at 4:24 AM, Pravin B Shelar <pshe...@ovn.org> wrote: > Signed-off-by: Pravin B Shelar <pshe...@ovn.org> > --- > acinclude.m4 | 8 ++++++-- > datapath/linux/compat/include/linux/netdevice.h | 17 +++++++++++++++-- > datapath/vport-netdev.c | 2 +- > 3 files changed, 22 insertions(+), 5 deletions(-) > > diff --git a/acinclude.m4 b/acinclude.m4 > index 6b608ef..6b8d30f 100644 > --- a/acinclude.m4 > +++ b/acinclude.m4 > @@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [ > AC_MSG_RESULT([$kversion]) > > if test "$version" -ge 4; then > - if test "$version" = 4 && test "$patchlevel" -le 4; then > + if test "$version" = 4 && test "$patchlevel" -le 5; then > : # Linux 4.x > else > - AC_ERROR([Linux kernel in $KBUILD is version $kversion, but > version newer than 4.4.x is not supported (please refer to the FAQ for > advice)]) > + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but > version newer than 4.5.x is not supported (please refer to the FAQ for > advice)]) > fi > elif test "$version" = 3 && test "$patchlevel" -ge 10; then > : # Linux 3.x > @@ -475,6 +475,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ > [OVS_DEFINE([HAVE_UDP_OFFLOAD_ARG_UOFF])]) > OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [gro_remcsum]) > OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [IFF_PHONY_HEADROOM]) > + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], > [netdev_master_upper_dev_link]) > + OVS_FIND_PARAM_IFELSE([$KSRC/include/linux/netdevice.h], > + [netdev_master_upper_dev_link], [upper_priv], > + > [OVS_DEFINE([HAVE_NETDEV_MASTER_UPPER_DEV_LINK_PRIV])])
I think you don't need to first check that the function exists - it should be safe to just directly use OVS_FIND_PARAM_IFELSE and if the function isn't defined at all then it still won't define the symbol. Acked-by: Jesse Gross <je...@kernel.org> _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
