diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-06-24 15:46:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-24 15:46:12 +0200 |
| commit | 4cd26be0f32d169341770a8a990a3069d33536ca (patch) | |
| tree | 3cba08ea4572f5c23dc56a4988c15475f5307f14 /zebra | |
| parent | Merge pull request #11462 from donaldsharp/random_stuff_right (diff) | |
| parent | zebra: move the check for l3vni (diff) | |
| download | frr-4cd26be0f32d169341770a8a990a3069d33536ca.tar.xz frr-4cd26be0f32d169341770a8a990a3069d33536ca.zip | |
Merge pull request #11258 from anlancs/fix/zebra-keep-nb-check
zebra: move the checks for l3vni
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/zebra_vxlan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 927df14fb..4cf309f7f 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -5273,10 +5273,6 @@ int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf *zvrf, vni_t vni, add ? "ADD" : "DEL"); if (add) { - - /* Remove L2VNI if present */ - zebra_vxlan_handle_vni_transition(zvrf, vni, add); - /* check if the vni is already present under zvrf */ if (zvrf->l3vni) { snprintf(err, err_str_sz, @@ -5292,6 +5288,9 @@ int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf *zvrf, vni_t vni, return -1; } + /* Remove L2VNI if present */ + zebra_vxlan_handle_vni_transition(zvrf, vni, add); + /* add the L3-VNI to the global table */ zl3vni = zl3vni_add(vni, zvrf_id(zvrf)); |