diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-09 10:35:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-09 10:35:13 +0100 |
| commit | 57cde551225bb09fa40ca3938e06d59fc529ff90 (patch) | |
| tree | 1c39f6262c41565add24374503a1c1ffe4bc12d3 /include/uapi/linux | |
| parent | usb: misc: brcmstb-usb-pinmap: Make sync_all_pins static (diff) | |
| parent | Linux 5.10-rc3 (diff) | |
Merge 5.10-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/icmpv6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h index c1661febc2dc..0564fd7ccde4 100644 --- a/include/uapi/linux/icmpv6.h +++ b/include/uapi/linux/icmpv6.h @@ -138,6 +138,7 @@ struct icmp6hdr { #define ICMPV6_HDR_FIELD 0 #define ICMPV6_UNK_NEXTHDR 1 #define ICMPV6_UNK_OPTION 2 +#define ICMPV6_HDR_INCOMP 3 /* * constants for (set|get)sockopt |