diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-10-23 16:10:06 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-10-27 16:41:07 +0200 |
| commit | 3d468f66043d444476004d004954503b17fdf96d (patch) | |
| tree | d140210910c932bbaef3cdc93c3cc44b605d961a /zebra/zebra_mpls_netlink.c | |
| parent | Merge pull request #1365 from donaldsharp/pim_vrf_cleanup (diff) | |
| download | frr-3d468f66043d444476004d004954503b17fdf96d.tar.xz frr-3d468f66043d444476004d004954503b17fdf96d.zip | |
zebra: Move clear_nhlfe_installed to calling functions
The function clear_nhlfe_installed is to be called
when we get a install failure of some sort for
a lsp change. Since an install failure can happen
in both linux and openBSD moving the function call
northbound is a good idea.
I've also added it to the kernel_del_lsp for completeness
on failure as well, even though neither linux or openBSD
currently can fail a uninstall.
This still leaves the hole where if we have multiple
nhlfes and have an install failure we are not quite
doing the right thing by just blanketly calling
clear_nhlfe_installed.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_mpls_netlink.c')
| -rw-r--r-- | zebra/zebra_mpls_netlink.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zebra/zebra_mpls_netlink.c b/zebra/zebra_mpls_netlink.c index 8b30783a9..8b8d018d0 100644 --- a/zebra/zebra_mpls_netlink.c +++ b/zebra/zebra_mpls_netlink.c @@ -40,8 +40,6 @@ int kernel_add_lsp(zebra_lsp_t *lsp) ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp); if (!ret) SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED); - else - clear_nhlfe_installed(lsp); return ret; } @@ -74,8 +72,6 @@ int kernel_upd_lsp(zebra_lsp_t *lsp) ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp); if (!ret) SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED); - else - clear_nhlfe_installed(lsp); return ret; } |