diff options
Diffstat (limited to 'src/vnet/ipip/sixrd.c')
| -rw-r--r-- | src/vnet/ipip/sixrd.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/vnet/ipip/sixrd.c b/src/vnet/ipip/sixrd.c index 492b4f83260..6e0bfb042cc 100644 --- a/src/vnet/ipip/sixrd.c +++ b/src/vnet/ipip/sixrd.c @@ -250,7 +250,6 @@ sixrd_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) return /* no error */ 0; } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS(sixrd_hw_interface_class) = { .name = "ip6ip-6rd", .build_rewrite = sixrd_build_rewrite, @@ -265,7 +264,6 @@ VNET_DEVICE_CLASS(sixrd_device_class) = { #endif } ; -/* *INDENT-ON* */ int sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, @@ -325,6 +323,8 @@ sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, t->user_instance = t_idx; vnet_sw_interface_set_mtu (vnet_get_main (), t->sw_if_index, 1480); + vnet_set_interface_l3_output_node (gm->vlib_main, hi->sw_if_index, + (u8 *) "tunnel-output"); ipip_tunnel_db_add (t, &key); @@ -339,7 +339,6 @@ sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, ip6_sw_interface_enable_disable (t->sw_if_index, true); /* Create IPv6 route/adjacency */ - /* *INDENT-OFF* */ fib_prefix_t pfx6 = { .fp_proto = FIB_PROTOCOL_IP6, .fp_len = t->sixrd.ip6_prefix_len, @@ -347,7 +346,6 @@ sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, .ip6 = t->sixrd.ip6_prefix, }, }; - /* *INDENT-ON* */ fib_table_lock (ip6_fib_index, FIB_PROTOCOL_IP6, FIB_SOURCE_6RD); fib_table_entry_update_one_path (ip6_fib_index, &pfx6, FIB_SOURCE_6RD, @@ -384,7 +382,6 @@ sixrd_del_tunnel (u32 sw_if_index) return -1; } - /* *INDENT-OFF* */ fib_prefix_t pfx6 = { .fp_proto = FIB_PROTOCOL_IP6, .fp_len = t->sixrd.ip6_prefix_len, @@ -392,7 +389,6 @@ sixrd_del_tunnel (u32 sw_if_index) .ip6 = t->sixrd.ip6_prefix, }, }; - /* *INDENT-ON* */ fib_table_entry_path_remove (t->sixrd.ip6_fib_index, &pfx6, FIB_SOURCE_6RD, @@ -403,6 +399,7 @@ sixrd_del_tunnel (u32 sw_if_index) vnet_sw_interface_set_flags (vnet_get_main (), t->sw_if_index, 0 /* down */ ); + vnet_reset_interface_l3_output_node (gm->vlib_main, t->sw_if_index); ip6_sw_interface_enable_disable (t->sw_if_index, false); gm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0; @@ -502,7 +499,8 @@ sixrd_init (vlib_main_t * vm) sixrd_adj_delegate_type = adj_delegate_register_new_type (&sixrd_adj_delegate_vft); - sixrd_fib_node_type = fib_node_register_new_type (&sixrd_fib_node_vft); + sixrd_fib_node_type = + fib_node_register_new_type ("sixrd", &sixrd_fib_node_vft); return error; } |