* [LTP] [PATCH v2 1/1] lapi: Add missing IFA_FLAGS
2021-05-14 8:06 [LTP] [PATCH v2 1/1] lapi: Add missing IFA_FLAGS Petr Vorel
@ 2021-05-14 7:45 ` Cyril Hrubis
2021-05-14 8:55 ` Petr Vorel
0 siblings, 1 reply; 3+ messages in thread
From: Cyril Hrubis @ 2021-05-14 7:45 UTC (permalink / raw)
To: ltp
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
>
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 3+ messages in thread
* [LTP] [PATCH v2 1/1] lapi: Add missing IFA_FLAGS
@ 2021-05-14 8:06 Petr Vorel
2021-05-14 7:45 ` Cyril Hrubis
0 siblings, 1 reply; 3+ messages in thread
From: Petr Vorel @ 2021-05-14 8:06 UTC (permalink / raw)
To: ltp
From: Petr Vorel <petr.vorel@gmail.com>
and use them in tst_netdevice.c. This fixes on older toolchains
(e.g. sourcery-arm from Buildroot):
tst_netdevice.c: In function 'modify_address':
tst_netdevice.c:218:44: error: 'IFA_FLAGS' undeclared (first use in this function)
if (!tst_rtnl_add_attr(file, lineno, ctx, IFA_FLAGS, &addr_flags,
Fixes: bc2151a65 ("lib: Add helper functions for managing network interfaces")
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Changes v1->v2:
* add missing #include "config.h"
* rename: lapi/if_addr.h => lapi/rtnetlink.h (Cyril)
* include <linux/rtnetlink.h> instead of <linux/if_addr.h> (Cyril)
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 \
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [LTP] [PATCH v2 1/1] lapi: Add missing IFA_FLAGS
2021-05-14 7:45 ` Cyril Hrubis
@ 2021-05-14 8:55 ` Petr Vorel
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vorel @ 2021-05-14 8:55 UTC (permalink / raw)
To: ltp
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-14 8:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-14 8:06 [LTP] [PATCH v2 1/1] lapi: Add missing IFA_FLAGS Petr Vorel
2021-05-14 7:45 ` Cyril Hrubis
2021-05-14 8:55 ` Petr Vorel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.