diff mbox series

[net-next,3/3] ICMPv6: define probe message types

Message ID 55eb7b376f03af953f79810794c6349632189eae.1605303918.git.andreas.a.roeseler@gmail.com
State Superseded
Headers show
Series Add support for sending RFC8335 PROBE | expand

Commit Message

Andreas Roeseler Nov. 13, 2020, 9:59 p.m. UTC
The types of ICMPv6 Extended Echo Request and ICMPv6 Extended Echo Reply
messages are defined by sections 2 adn 3 of RFC8335.

Signed-off-by: Andreas Roeseler <andreas.a.roeseler@gmail.com>
---
 include/uapi/linux/icmpv6.h | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Jakub Kicinski Nov. 14, 2020, 12:39 a.m. UTC | #1
On Fri, 13 Nov 2020 13:59:45 -0800 Andreas Roeseler wrote:
> The types of ICMPv6 Extended Echo Request and ICMPv6 Extended Echo Reply
> messages are defined by sections 2 adn 3 of RFC8335.
> 
> Signed-off-by: Andreas Roeseler <andreas.a.roeseler@gmail.com>
> ---
>  include/uapi/linux/icmpv6.h | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h
> index c1661febc2dc..183a8b3feb92 100644
> --- a/include/uapi/linux/icmpv6.h
> +++ b/include/uapi/linux/icmpv6.h
> @@ -139,6 +139,12 @@ struct icmp6hdr {
>  #define ICMPV6_UNK_NEXTHDR		1
>  #define ICMPV6_UNK_OPTION		2
>  
> +/*
> + *	Codes for EXT_ECHO (Probe)
> + */
> +#define ICMPV6_EXT_ECHO_REQUEST		160
> +#define ICMPV6_EXT_ECHO_REPLY		161
> +
>  /*
>   *	constants for (set|get)sockopt
>   */

This patch does not apply to net-next [1]:

Applying: ICMPv6: define probe message types
error: patch failed: include/uapi/linux/icmpv6.h:139
error: include/uapi/linux/icmpv6.h: patch does not apply
Patch failed at 0003 ICMPv6: define probe message types
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
fatal: It looks like 'git am' is in progress. Cannot rebase.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/
diff mbox series

Patch

diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h
index c1661febc2dc..183a8b3feb92 100644
--- a/include/uapi/linux/icmpv6.h
+++ b/include/uapi/linux/icmpv6.h
@@ -139,6 +139,12 @@  struct icmp6hdr {
 #define ICMPV6_UNK_NEXTHDR		1
 #define ICMPV6_UNK_OPTION		2
 
+/*
+ *	Codes for EXT_ECHO (Probe)
+ */
+#define ICMPV6_EXT_ECHO_REQUEST		160
+#define ICMPV6_EXT_ECHO_REPLY		161
+
 /*
  *	constants for (set|get)sockopt
  */