Message ID | 20210514080630.11273-1-pvorel@suse.cz |
---|---|
State | Changes Requested |
Headers | show |
Series | [v2,1/1] lapi: Add missing IFA_FLAGS | expand |
Hi! > configure.ac | 1 + > include/lapi/rtnetlink.h | 17 +++++++++++++++++ > lib/tst_netdevice.c | 3 ++- > 3 files changed, 20 insertions(+), 1 deletion(-) > create mode 100644 include/lapi/rtnetlink.h > > diff --git a/configure.ac b/configure.ac > index 136d82d09..95c6d2e72 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -59,6 +59,7 @@ AC_CHECK_HEADERS_ONCE([ \ > linux/mempolicy.h \ > linux/module.h \ > linux/netlink.h \ > + linux/rtnetlink.h \ I wonder if this is really needed, if that header is not present we will have to add much more stuff to lapi/rtnetlink.h, so I would just avoid configure check here. > linux/seccomp.h \ > linux/securebits.h \ > linux/tty.h \ > diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h > new file mode 100644 > index 000000000..d1dc53df8 > --- /dev/null > +++ b/include/lapi/rtnetlink.h > @@ -0,0 +1,17 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com> */ > + > +#ifndef LAPI_IF_ADDR_H__ > +# define LAPI_IF_ADDR_H__ > + > +#include "config.h" > + > +#ifdef HAVE_LINUX_RTNETLINK_H > +# include <linux/rtnetlink.h> > +#endif > + > +#ifndef IFA_FLAGS > +# define IFA_FLAGS 8 > +#endif > + > +#endif /* LAPI_IF_ADDR_H__ */ > diff --git a/lib/tst_netdevice.c b/lib/tst_netdevice.c > index 5ca523759..d098173d5 100644 > --- a/lib/tst_netdevice.c > +++ b/lib/tst_netdevice.c > @@ -5,10 +5,11 @@ > > #include <asm/types.h> > #include <linux/netlink.h> > -#include <linux/rtnetlink.h> > #include <linux/veth.h> > #include <sys/socket.h> > #include <net/if.h> > +#include "lapi/rtnetlink.h" > + > #define TST_NO_DEFAULT_MAIN > #include "tst_test.h" > #include "tst_rtnetlink.h" > -- > 2.31.1 >
Hi Cyril, > Hi! > > configure.ac | 1 + > > include/lapi/rtnetlink.h | 17 +++++++++++++++++ > > lib/tst_netdevice.c | 3 ++- > > 3 files changed, 20 insertions(+), 1 deletion(-) > > create mode 100644 include/lapi/rtnetlink.h > > diff --git a/configure.ac b/configure.ac > > index 136d82d09..95c6d2e72 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -59,6 +59,7 @@ AC_CHECK_HEADERS_ONCE([ \ > > linux/mempolicy.h \ > > linux/module.h \ > > linux/netlink.h \ > > + linux/rtnetlink.h \ > I wonder if this is really needed, if that header is not present we will > have to add much more stuff to lapi/rtnetlink.h, so I would just avoid > configure check here. Sure, we save some time during configure. Sending v3 (being conservative as there is a git freeze). Kind regards, Petr
diff --git a/configure.ac b/configure.ac index 136d82d09..95c6d2e72 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ AC_CHECK_HEADERS_ONCE([ \ linux/mempolicy.h \ linux/module.h \ linux/netlink.h \ + linux/rtnetlink.h \ linux/seccomp.h \ linux/securebits.h \ linux/tty.h \ diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h new file mode 100644 index 000000000..d1dc53df8 --- /dev/null +++ b/include/lapi/rtnetlink.h @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com> */ + +#ifndef LAPI_IF_ADDR_H__ +# define LAPI_IF_ADDR_H__ + +#include "config.h" + +#ifdef HAVE_LINUX_RTNETLINK_H +# include <linux/rtnetlink.h> +#endif + +#ifndef IFA_FLAGS +# define IFA_FLAGS 8 +#endif + +#endif /* LAPI_IF_ADDR_H__ */ diff --git a/lib/tst_netdevice.c b/lib/tst_netdevice.c index 5ca523759..d098173d5 100644 --- a/lib/tst_netdevice.c +++ b/lib/tst_netdevice.c @@ -5,10 +5,11 @@ #include <asm/types.h> #include <linux/netlink.h> -#include <linux/rtnetlink.h> #include <linux/veth.h> #include <sys/socket.h> #include <net/if.h> +#include "lapi/rtnetlink.h" + #define TST_NO_DEFAULT_MAIN #include "tst_test.h" #include "tst_rtnetlink.h"