commit ec40a7d2bce4bba67af3b3d971547d40e90fdf97
author Neale Ranns <nranns@cisco.com> Thu Apr 23 07:36:12 2020 +0000
committer Ole Trøan <otroan@employees.org> Fri Apr 24 09:24:43 2020 +0000
tree 8cab359d02dfce38d57f7d9b2e741e7a406ef6b1
parent 82b62bbf58bc3d1143a359d8f58f7be2f473cddd

ip: Setting the Link-Local address from the API enables IPv6 on the
interface

Type: fix

Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: I0b7c189006e30a357cd6be4f3c9c61fded4157cb

src/vnet/ip/ip6_link.c

diff --git a/src/vnet/ip/ip6_link.c b/src/vnet/ip/ip6_link.c
index 35b718e..d2142f9 100644
--- a/src/vnet/ip/ip6_link.c
+++ b/src/vnet/ip/ip6_link.c
@@ -146,7 +146,7 @@
 
 
 int
-ip6_link_enable (u32 sw_if_index)
+ip6_link_enable (u32 sw_if_index, const ip6_address_t * link_local_addr)
 {
   ip6_link_t *il;
   int rv;
@@ -187,9 +187,11 @@
 
       sw = vnet_get_sup_sw_interface (vnm, sw_if_index);
 
-      if (sw->type == VNET_SW_INTERFACE_TYPE_SUB ||
-	  sw->type == VNET_SW_INTERFACE_TYPE_PIPE ||
-	  sw->type == VNET_SW_INTERFACE_TYPE_P2P)
+      if (NULL != link_local_addr)
+	ip6_address_copy (&il->il_ll_addr, link_local_addr);
+      else if (sw->type == VNET_SW_INTERFACE_TYPE_SUB ||
+	       sw->type == VNET_SW_INTERFACE_TYPE_PIPE ||
+	       sw->type == VNET_SW_INTERFACE_TYPE_P2P)
 	{
 	  il->il_ll_addr.as_u64[0] =
 	    clib_host_to_net_u64 (0xFE80000000000000ULL);
@@ -367,7 +369,7 @@
 }
 
 int
-ip6_set_link_local_address (u32 sw_if_index, const ip6_address_t * address)
+ip6_link_set_local_address (u32 sw_if_index, const ip6_address_t * address)
 {
   ip6_link_delegate_t *ild;
   ip6_link_t *il;
@@ -375,7 +377,7 @@
   il = ip6_link_get (sw_if_index);
 
   if (NULL == il)
-    return (VNET_API_ERROR_IP6_NOT_ENABLED);
+    return ip6_link_enable (sw_if_index, address);
 
   ip6_ll_prefix_t ilp = {
     .ilp_addr = il->il_ll_addr,
@@ -794,7 +796,7 @@
 
   if (unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
     {
-      if (ip6_link_enable (sw_if_index))
+      if (ip6_link_enable (sw_if_index, NULL))
 	error = clib_error_return (0, "Failed\n");
     }
   else