diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-11-29 17:54:27 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-11-29 19:01:01 +0100 |
| commit | 9fa38ec6bbd6d0755c4b0e5ca718ded97d8e2f79 (patch) | |
| tree | 33f04169fcc86bdda71ccc21f9d28cc456206615 /zebra/zebra_mpls_netlink.c | |
| parent | zebra: Fix lsp add/del from kernel using SETFLAG (diff) | |
| download | frr-9fa38ec6bbd6d0755c4b0e5ca718ded97d8e2f79.tar.xz frr-9fa38ec6bbd6d0755c4b0e5ca718ded97d8e2f79.zip | |
zebra: Fix route replace flags
When doing a route replace, on openbsd we were not
marking the old lsp as no longer installed, while
on linux we were. Move the abstraction up a layer.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_mpls_netlink.c')
| -rw-r--r-- | zebra/zebra_mpls_netlink.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/zebra/zebra_mpls_netlink.c b/zebra/zebra_mpls_netlink.c index 64b1a7c0a..3c8d25189 100644 --- a/zebra/zebra_mpls_netlink.c +++ b/zebra/zebra_mpls_netlink.c @@ -60,29 +60,12 @@ void kernel_add_lsp(zebra_lsp_t *lsp) void kernel_upd_lsp(zebra_lsp_t *lsp) { int ret; - zebra_nhlfe_t *nhlfe; - struct nexthop *nexthop; if (!lsp || !lsp->best_nhlfe) { // unexpected kernel_lsp_pass_fail(lsp, SOUTHBOUND_INSTALL_FAILURE); return; } - /* Any NHLFE that was installed but is not selected now needs to - * have its flags updated. - */ - for (nhlfe = lsp->nhlfe_list; nhlfe; nhlfe = nhlfe->next) { - nexthop = nhlfe->nexthop; - if (!nexthop) - continue; - - if (CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED) && - !CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_SELECTED)) { - UNSET_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED); - UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB); - } - } - ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp); kernel_lsp_pass_fail(lsp, |