diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2022-12-05 11:32:11 +0300 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2022-12-07 21:08:57 +0300 |
| commit | d9f26ae731259c8fb2d62a742c64e454996944a8 (patch) | |
| tree | 08a1d422cf241d256acb7e61cb60a9e0c4782278 /include/uapi/linux | |
| parent | 29636a5ce87bebab38c533175d72bb800a7581b8 (diff) | |
| parent | 76dcd734eca23168cb008912c0f69ff408905235 (diff) | |
| download | linux-d9f26ae731259c8fb2d62a742c64e454996944a8.tar.xz | |
Merge tag 'v6.1-rc8' into efi/next
Linux 6.1-rc8
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/ip.h | 6 | ||||
| -rw-r--r-- | include/uapi/linux/ipv6.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h index 961ec16a26b8..874a92349bf5 100644 --- a/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h @@ -100,8 +100,10 @@ struct iphdr { __u8 ttl; __u8 protocol; __sum16 check; - __be32 saddr; - __be32 daddr; + __struct_group(/* no tag */, addrs, /* no attrs */, + __be32 saddr; + __be32 daddr; + ); /*The options start here. */ }; 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; + ); }; |