diff options
| author | Xiao Liang <shaw.leon@gmail.com> | 2022-12-15 17:04:32 +0800 |
|---|---|---|
| committer | Xiao Liang <shaw.leon@gmail.com> | 2023-07-27 15:07:42 +0800 |
| commit | cea3f7f25a23e485d4f814b670c11c92249568e1 (patch) | |
| tree | d1a44bda931904553f9384f3ebfa063d6766a0b9 /lib | |
| parent | 49f04841131b917ac6218ecba933af36f51a7f91 (diff) | |
lib, zebra: Fix EVPN nexthop config order
Delay EVPN route addition to synchronize with rib_delete(), which now
uses early route queue.
Signed-off-by: Xiao Liang <shaw.leon@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/nexthop.c | 1 | ||||
| -rw-r--r-- | lib/nexthop.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/nexthop.c b/lib/nexthop.c index 6b6b0a79c1..4f92ef9c8b 100644 --- a/lib/nexthop.c +++ b/lib/nexthop.c @@ -797,6 +797,7 @@ void nexthop_copy_no_recurse(struct nexthop *copy, memcpy(©->gate, &nexthop->gate, sizeof(nexthop->gate)); memcpy(©->src, &nexthop->src, sizeof(nexthop->src)); memcpy(©->rmap_src, &nexthop->rmap_src, sizeof(nexthop->rmap_src)); + memcpy(©->rmac, &nexthop->rmac, sizeof(nexthop->rmac)); copy->rparent = rparent; if (nexthop->nh_label) nexthop_add_labels(copy, nexthop->nh_label_type, diff --git a/lib/nexthop.h b/lib/nexthop.h index 43dd71e112..2be89f8240 100644 --- a/lib/nexthop.h +++ b/lib/nexthop.h @@ -125,6 +125,12 @@ struct nexthop { vni_t vni; } nh_encap; + /* EVPN router's MAC. + * Don't support multiple RMAC from the same VTEP yet, so it's not + * included in hash key. + */ + struct ethaddr rmac; + /* SR-TE color used for matching SR-TE policies */ uint32_t srte_color; |