diff options
| author |   Ed Warnicke <hagbard@gmail.com> | 2022-02-18 19:26:35 +0000 |
|---|---|---|
| committer | Ed Warnicke <hagbard@gmail.com> | 2022-02-18 19:52:06 +0000 |
| commit | 47617a98c89df756aafb2e73b42eb10058e930fc (patch) | |
| tree | e67becd1ed328ac2eee159e876100e4ae03bb9ea | |
| parent | 53ecd05962c489a3aeb0c20e4afa2a120e8b14ef (diff) | |
vxlan: crash on assigning IP address to interface
Revert "vxlan: crash on configuring vxlan tunnel on l3 mode"
This reverts commit b8de7d43e4955bb4025cd0e0e7390279841b6d7d.
Reason for revert: VPP-2014
Type: fix
Fixes: b8de7d43e4955bb4025cd0e0e7390279841b6d7d
Change-Id: Ic4d10f28985ee10e0550a1bbfd465ada915e4aa6
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
| -rw-r--r-- | src/vnet/vxlan/vxlan.c | 13 | ||||
| -rw-r--r-- | src/vnet/vxlan/vxlan.h | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c index f394b6b7c89..854498455e4 100644 --- a/src/vnet/vxlan/vxlan.c +++ b/src/vnet/vxlan/vxlan.c @@ -82,8 +82,6 @@ format_vxlan_tunnel (u8 * s, va_list * args) if (PREDICT_FALSE (t->decap_next_index != VXLAN_INPUT_NEXT_L2_INPUT)) s = format (s, "decap-next-%U ", format_decap_next, t->decap_next_index); - s = format (s, "l3 %u ", t->is_l3); - if (PREDICT_FALSE (ip46_address_is_multicast (&t->dst))) s = format (s, "mcast-sw-if-idx %d ", t->mcast_sw_if_index); @@ -247,8 +245,7 @@ const static fib_node_vft_t vxlan_vft = { _ (src) \ _ (dst) \ _ (src_port) \ - _ (dst_port) \ - _ (is_l3) + _ (dst_port) static void vxlan_rewrite (vxlan_tunnel_t * t, bool is_ip6) @@ -451,7 +448,7 @@ int vnet_vxlan_add_del_tunnel t->user_instance = user_instance; /* name */ t->flow_index = ~0; - if (a->is_l3 == 0) + if (a->is_l3) t->hw_if_index = vnet_register_interface (vnm, vxlan_device_class.index, dev_instance, vxlan_hw_class.index, dev_instance); @@ -504,7 +501,7 @@ int vnet_vxlan_add_del_tunnel if (add_failed) { - if (a->is_l3 == 0) + if (a->is_l3) vnet_delete_hw_interface (vnm, t->hw_if_index); else ethernet_delete_interface (vnm, t->hw_if_index); @@ -657,7 +654,8 @@ int vnet_vxlan_add_del_tunnel mcast_shared_remove (&t->dst); } - if (t->is_l3 == 0) + vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, t->hw_if_index); + if (hw->dev_class_index == vxlan_device_class.index) vnet_delete_hw_interface (vnm, t->hw_if_index); else ethernet_delete_interface (vnm, t->hw_if_index); @@ -844,6 +842,7 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, vnet_vxlan_add_del_tunnel_args_t a = { .is_add = is_add, .is_ip6 = ipv6_set, + .is_l3 = is_l3, .instance = instance, #define _(x) .x = x, foreach_copy_field diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h index 290f03d57c4..fa47605e42d 100644 --- a/src/vnet/vxlan/vxlan.h +++ b/src/vnet/vxlan/vxlan.h @@ -135,7 +135,6 @@ typedef struct u32 user_instance; /* Instance name being shown to user */ VNET_DECLARE_REWRITE; - u8 is_l3; } vxlan_tunnel_t; #define foreach_vxlan_input_next \ |