ip: Router ID included in flow hash
[vpp.git] / src / vnet / ip / ip46_cli.c
index e0e26a2..f58be89 100644 (file)
@@ -38,8 +38,8 @@
  */
 
 #include <vnet/ip/ip.h>
-#include <vnet/ip/ip4_reassembly.h>
-#include <vnet/ip/ip6_reassembly.h>
+#include <vnet/ip/reass/ip4_full_reass.h>
+#include <vnet/ip/reass/ip6_full_reass.h>
 
 /**
  * @file
@@ -206,10 +206,10 @@ done:
  * @cliexcmd{set interface ip address GigabitEthernet2/0/0 @::a:1:1:0:7/126}
  *
  * To delete a specific interface ip address:
- * @cliexcmd{set interface ip address GigabitEthernet2/0/0 172.16.2.12/24 del}
+ * @cliexcmd{set interface ip address del GigabitEthernet2/0/0 172.16.2.12/24}
  *
  * To delete all interfaces addresses (IPv4 and IPv6):
- * @cliexcmd{set interface ip address GigabitEthernet2/0/0 del all}
+ * @cliexcmd{set interface ip address del GigabitEthernet2/0/0 all}
  * @endparblock
  ?*/
 /* *INDENT-OFF* */
@@ -269,26 +269,26 @@ set_reassembly_command_fn (vlib_main_t * vm,
     }
 
 
-  vnet_api_error_t rv4 = ip4_reass_enable_disable (sw_if_index, ip4_on);
-  vnet_api_error_t rv6 = ip6_reass_enable_disable (sw_if_index, ip6_on);
+  vnet_api_error_t rv4 = ip4_full_reass_enable_disable (sw_if_index, ip4_on);
+  vnet_api_error_t rv6 = ip6_full_reass_enable_disable (sw_if_index, ip6_on);
   if (rv4 && rv6)
     {
       return clib_error_return (0,
-                               "`ip4_reass_enable_disable' API call failed, rv=%d:%U, "
-                               "`ip6_reass_enable_disable' API call failed, rv=%d:%U",
+                               "`ip4_full_reass_enable_disable' API call failed, rv=%d:%U, "
+                               "`ip6_full_reass_enable_disable' API call failed, rv=%d:%U",
                                (int) rv4, format_vnet_api_errno, rv4,
                                (int) rv6, format_vnet_api_errno, rv6);
     }
   else if (rv4)
     {
       return clib_error_return (0,
-                               "`ip4_reass_enable_disable' API call failed, rv=%d:%U",
+                               "`ip4_full_reass_enable_disable' API call failed, rv=%d:%U",
                                (int) rv4, format_vnet_api_errno, rv4);
     }
   else if (rv6)
     {
       return clib_error_return (0,
-                               "`ip6_reass_enable_disable' API call failed, rv=%d:%U",
+                               "`ip6_full_reass_enable_disable' API call failed, rv=%d:%U",
                                (int) rv6, format_vnet_api_errno, rv6);
     }
   return NULL;