[systemd-devel] [PATCH] missing.h: add NDA_*

[Tom Gundersen]

Applied. Thanks!

On Mon, Mar 9, 2015 at 12:27 PM, Michael Olbrich
<m.olbrich at pengutronix.de> wrote:
> This is necessary to build with older kernel headers. NDA_VLAN was
> introduced in v3.9 and NDA_PORT, NDA_VNI and NDA_IFINDEX in v3.10
> ---
>  configure.ac         |  4 +++-
>  src/shared/missing.h | 16 ++++++++++++++++
>  2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 14518bc52b1d..29111f5fee84 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -333,7 +333,8 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
>                  IFLA_VXLAN_LOCAL6,
>                  IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
>                  IFLA_BRIDGE_VLAN_INFO,
> -                IFLA_BRPORT_UNICAST_FLOOD],
> +                IFLA_BRPORT_UNICAST_FLOOD,
> +                NDA_IFINDEX],
>  [], [], [[
>  #include <inttypes.h>
>  #include <netinet/in.h>
> @@ -344,6 +345,7 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
>  #include <linux/if_tunnel.h>
>  #include <linux/if_link.h>
>  #include <linux/if_bridge.h>
> +#include <linux/neighbour.h>
>  ]])
>
>  # This makes sure pkg.m4 is available.
> diff --git a/src/shared/missing.h b/src/shared/missing.h
> index e72631e130d9..802b4957e0a1 100644
> --- a/src/shared/missing.h
> +++ b/src/shared/missing.h
> @@ -35,6 +35,7 @@
>  #include <linux/loop.h>
>  #include <linux/audit.h>
>  #include <linux/capability.h>
> +#include <linux/neighbour.h>
>
>  #ifdef HAVE_AUDIT
>  #include <libaudit.h>
> @@ -623,6 +624,21 @@ static inline int setns(int fd, int nstype) {
>  #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
>  #endif
>
> +#if !HAVE_DECL_NDA_IFINDEX
> +#define NDA_UNSPEC 0
> +#define NDA_DST 1
> +#define NDA_LLADDR 2
> +#define NDA_CACHEINFO 3
> +#define NDA_PROBES 4
> +#define NDA_VLAN 5
> +#define NDA_PORT 6
> +#define NDA_VNI 7
> +#define NDA_IFINDEX 8
> +#define __NDA_MAX 9
> +
> +#define NDA_MAX (__NDA_MAX - 1)
> +#endif
> +
>  #ifndef IPV6_UNICAST_IF
>  #define IPV6_UNICAST_IF 76
>  #endif
> --
> 2.1.4
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel