From: Florin Coras <fcoras@cisco.com>
Date: Fri, 24 May 2019 11:30:08 +0000 (-0700)
Subject: udp-ping: disable due to conflict with mldv2
X-Git-Tag: v20.01-rc0~560
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F19816%2F2;p=vpp.git

udp-ping: disable due to conflict with mldv2

Change-Id: I9e6a0fb583b0b6dd9b5e16aa9169bdf7b99a7664
Signed-off-by: Florin Coras <fcoras@cisco.com>
---

diff --git a/src/plugins/ioam/udp-ping/udp_ping_node.c b/src/plugins/ioam/udp-ping/udp_ping_node.c
index e5916dbd0e1..f48a15c7c0c 100644
--- a/src/plugins/ioam/udp-ping/udp_ping_node.c
+++ b/src/plugins/ioam/udp-ping/udp_ping_node.c
@@ -823,8 +823,10 @@ udp_ping_init (vlib_main_t * vm)
   udp_ping_main.vnet_main = vnet_get_main ();
   udp_ping_main.timer_interval = 1e9;
 
-  ip6_register_protocol (IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS,
-			 udp_ping_local.index);
+  /* This steals MLDv2 listener reports. Disable until we properly handle
+   * hop-by-hop options in ip6-local */
+  /* ip6_register_protocol (IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS,
+     udp_ping_local.index); */
   return 0;
 }