diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2021-02-21 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2021-02-21 08:00:00 +0000 |
| commit | a37d4b866d6bb4e88dd1e3de8d461695751f314d (patch) | |
| tree | 021c51a094c94c34a684a1ad1ed7fea51e510064 /src/rtnl_addrlabel.c | |
| parent | da41b8cc2f8a01611ee828205231421e03c6081d (diff) | |
| download | strace-a37d4b866d6bb4e88dd1e3de8d461695751f314d.tar.gz | |
Switch to use bundled <linux/if_addrlabel.h>
* bundled/linux/include/uapi/linux/if_addrlabel.h: New file, copied from
headers_install'ed Linux kernel v5.11.
* bundled/Makefile.am (EXTRA_DIST): Add it.
* configure.ac (AC_CHECK_TYPES): Remove struct ifaddrlblmsg.
* src/netlink_route.c [!HAVE_STRUCT_IFADDRLBLMSG]: Remove.
* src/rtnl_addrlabel.c: Likewise.
* tests/netlink_route.c: Likewise.
* tests/nlattr_ifaddrlblmsg.c: Likewise.
* src/xlat/rtnl_addrlabel_attrs.in: Add #unconditional, remove fallback
definitions.
Diffstat (limited to 'src/rtnl_addrlabel.c')
| -rw-r--r-- | src/rtnl_addrlabel.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/rtnl_addrlabel.c b/src/rtnl_addrlabel.c index 332242252..59d4a94b7 100644 --- a/src/rtnl_addrlabel.c +++ b/src/rtnl_addrlabel.c @@ -9,15 +9,13 @@ #include "defs.h" -#ifdef HAVE_STRUCT_IFADDRLBLMSG +#include "netlink_route.h" +#include "nlattr.h" -# include "netlink_route.h" -# include "nlattr.h" +#include <linux/if_addrlabel.h> +#include "netlink.h" -# include <linux/if_addrlabel.h> -# include "netlink.h" - -# include "xlat/rtnl_addrlabel_attrs.h" +#include "xlat/rtnl_addrlabel_attrs.h" static bool decode_ifal_address(struct tcb *const tcp, @@ -73,5 +71,3 @@ DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg) ARRAY_SIZE(ifaddrlblmsg_nla_decoders), &ifal); } } - -#endif |