diff options
| author | David Lamparter <equinox@diac24.net> | 2019-02-05 00:54:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 00:54:16 +0100 |
| commit | 83c2a84d7cfe9b4132f15b04593869cee5f408e9 (patch) | |
| tree | 5f39f3561b35222fe36ce61aae78a29a2cac74c0 /zebra/zebra_vxlan.c | |
| parent | 5a753fee025b0cf5fcc0050ba41e5ec8cf948972 (diff) | |
| parent | b120fe3b69208980372d04728ee57894b6a7a842 (diff) | |
Merge pull request #3602 from donaldsharp/mlag_debug
zebra cleanup and some mlag additions
Diffstat (limited to 'zebra/zebra_vxlan.c')
| -rw-r--r-- | zebra/zebra_vxlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 49af4a9205..67f3db4b64 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -50,7 +50,7 @@ #include "zebra/zebra_vrf.h" #include "zebra/zebra_vxlan.h" #include "zebra/zebra_vxlan_private.h" -#include "zebra/zserv.h" +#include "zebra/zebra_router.h" DEFINE_MTYPE_STATIC(ZEBRA, HOST_PREFIX, "host prefix"); DEFINE_MTYPE_STATIC(ZEBRA, ZVNI, "VNI hash"); @@ -510,7 +510,7 @@ static void zebra_vxlan_dup_addr_detect_for_mac(struct zebra_vrf *zvrf, sizeof(buf)), mac->flags, zvrf->dad_freeze_time); - thread_add_timer(zebrad.master, + thread_add_timer(zrouter.master, zebra_vxlan_dad_mac_auto_recovery_exp, mac, zvrf->dad_freeze_time, &mac->dad_mac_auto_recovery_timer); @@ -643,7 +643,7 @@ static void zebra_vxlan_dup_addr_detect_for_neigh(struct zebra_vrf *zvrf, ipaddr2str(&nbr->ip, buf1, sizeof(buf1)), nbr->flags, zvrf->dad_freeze_time); - thread_add_timer(zebrad.master, + thread_add_timer(zrouter.master, zebra_vxlan_dad_ip_auto_recovery_exp, nbr, zvrf->dad_freeze_time, &nbr->dad_ip_auto_recovery_timer); |