diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-09 12:37:45 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2017-08-09 13:03:39 +0200 |
| commit | 69965f533aa368b4a630dafbcd72a4f600bd9e1c (patch) | |
| tree | 29fbd9adce8d50fb3183069e57f88f875b73efc0 /ldpd/neighbor.c | |
| parent | zebra: add support for static pseudowires (diff) | |
| download | frr-69965f533aa368b4a630dafbcd72a4f600bd9e1c.tar.xz frr-69965f533aa368b4a630dafbcd72a4f600bd9e1c.zip | |
zebra: fix pseudowire code re. upstream changes
- VTY_NEWLINE is out
- thread API changed with the extra arg
- struct rib got renamed to struct route_entry
- MPLS_NO_LABEL was removed
- RB-tree implementation has some extra args
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ldpd/neighbor.c')
| -rw-r--r-- | ldpd/neighbor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c index 1671fce4f..39860a185 100644 --- a/ldpd/neighbor.c +++ b/ldpd/neighbor.c @@ -316,7 +316,7 @@ nbr_del(struct nbr *nbr) mapping_list_clr(&nbr->release_list); mapping_list_clr(&nbr->abortreq_list); - while ((adj = RB_ROOT(&nbr->adj_tree)) != NULL) { + while ((adj = RB_ROOT(nbr_adj_head, &nbr->adj_tree)) != NULL) { adj->nbr = NULL; RB_REMOVE(nbr_adj_head, &nbr->adj_tree, adj); } |