diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-25 13:13:14 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-07-24 15:20:28 (GMT) |
| commit | 336b15dc087c7d8a945ef954fd40da59ef8c7f81 (patch) | |
| tree | b786b0aaf1cf9096be2a8bc98e1abd7af9c386c4 | |
| parent | e2cacc26a6e560baa7887bb257884f05fb4df31b (diff) | |
| download | libnl-336b15dc087c7d8a945ef954fd40da59ef8c7f81.zip libnl-336b15dc087c7d8a945ef954fd40da59ef8c7f81.tar.gz libnl-336b15dc087c7d8a945ef954fd40da59ef8c7f81.tar.bz2 | |
include/linux: update copy of kernel header "linux/ipv6.h"
The point is to bump DEVCONF_MAX.
Taken from upstream kernel commit 6995e2de6891c724bfeb2db33d7b87775f913ad1
(v6.4).
| -rw-r--r-- | include/linux-private/linux/ipv6.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h index 769b4a3..fcf05a6 100644 --- a/include/linux-private/linux/ipv6.h +++ b/include/linux-private/linux/ipv6.h @@ -4,6 +4,7 @@ #include <linux/libc-compat.h> #include <linux/types.h> +#include <linux/stddef.h> #include <linux/in6.h> #include <asm/byteorder.h> @@ -40,6 +41,7 @@ struct in6_ifreq { #define IPV6_SRCRT_STRICT 0x01 /* Deprecated; will be removed */ #define IPV6_SRCRT_TYPE_0 0 /* Deprecated; will be removed */ #define IPV6_SRCRT_TYPE_2 2 /* IPv6 type 2 Routing Header */ +#define IPV6_SRCRT_TYPE_3 3 /* RPL Segment Routing with IPv6 */ #define IPV6_SRCRT_TYPE_4 4 /* Segment Routing with IPv6 */ /* @@ -79,7 +81,7 @@ struct ipv6_opt_hdr { struct rt0_hdr { struct ipv6_rt_hdr rt_hdr; __u32 reserved; - struct in6_addr addr[0]; + struct in6_addr addr[]; #define rt0_type rt_hdr.type }; @@ -129,8 +131,10 @@ struct ipv6hdr { __u8 nexthdr; __u8 hop_limit; - struct in6_addr saddr; - struct in6_addr daddr; + __struct_group(/* no tag */, addrs, /* no attrs */, + struct in6_addr saddr; + struct in6_addr daddr; + ); }; @@ -187,6 +191,13 @@ enum { DEVCONF_DISABLE_POLICY, DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN, DEVCONF_NDISC_TCLASS, + DEVCONF_RPL_SEG_ENABLED, + DEVCONF_RA_DEFRTR_METRIC, + DEVCONF_IOAM6_ENABLED, + DEVCONF_IOAM6_ID, + DEVCONF_IOAM6_ID_WIDE, + DEVCONF_NDISC_EVICT_NOCARRIER, + DEVCONF_ACCEPT_UNTRACKED_NA, DEVCONF_MAX }; |