diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-11-20 11:29:39 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-11-20 11:29:39 -0300 |
| commit | b3c39b1a96a67a7e246d562f44d04ce6f9ef878f (patch) | |
| tree | 6874debfde448db313bd7c53c3aca59687038c1f /include/uapi/linux/ipv6.h | |
| parent | 63a3bf5e8d9e79ce456c8f73d4395a5a51d841b1 (diff) | |
| parent | 77c51ba552a1c4f73228766e43ae37c4101b3758 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and check if libraries used that comes from other trees
continue to work with tools/perf, such as tools/lib/bpf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/uapi/linux/ipv6.h')
| -rw-r--r-- | include/uapi/linux/ipv6.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h index 03cdbe798fe3..81f4243bebb1 100644 --- a/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h @@ -130,8 +130,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; + ); }; |