diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2021-01-15 18:24:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 18:24:38 -0500 |
| commit | e43bb302946cb4af4f4e860bc8e6d0f1a52f906c (patch) | |
| tree | 26b1bcf1fb786559df69cb1d5908d06d45f89050 | |
| parent | 18768cc1f9348e31a877b7ef4bf6de4744f07ae1 (diff) | |
| parent | 1fd7ae7268f6aeb8c52b7d470c98a8b3fc41765e (diff) | |
Merge pull request #7878 from opensourcerouting/ldpd-metric-issue
ldpd: fix sporadic failures in the ldp-topo1 topotest
| -rw-r--r-- | ldpd/lde.h | 2 | ||||
| -rw-r--r-- | ldpd/lde_lib.c | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ldpd/lde.h b/ldpd/lde.h index 28468931ec..e09be01ece 100644 --- a/ldpd/lde.h +++ b/ldpd/lde.h @@ -129,9 +129,7 @@ struct fec_node { uint32_t pw_remote_status; void *data; /* fec specific data */ - uint8_t flags; }; -#define F_FEC_NHS_CHANGED 0x01 #define CHUNK_SIZE 64 struct label_chunk { diff --git a/ldpd/lde_lib.c b/ldpd/lde_lib.c index 68b721e213..0f91f49920 100644 --- a/ldpd/lde_lib.c +++ b/ldpd/lde_lib.c @@ -340,8 +340,6 @@ lde_kernel_insert(struct fec *fec, int af, union ldpd_addr *nexthop, fnh = fec_nh_find(fn, af, nexthop, ifindex, route_type, route_instance); if (fnh == NULL) { - fn->flags |= F_FEC_NHS_CHANGED; - fnh = fec_nh_add(fn, af, nexthop, ifindex, route_type, route_instance); /* @@ -418,17 +416,11 @@ lde_kernel_update(struct fec *fec) } else fnh->flags |= F_FEC_NH_NO_LDP; } else { - fn->flags |= F_FEC_NHS_CHANGED; lde_send_delete_klabel(fn, fnh); fec_nh_del(fnh); } } - if (!(fn->flags & F_FEC_NHS_CHANGED)) - /* return earlier if nothing has changed */ - return; - fn->flags &= ~F_FEC_NHS_CHANGED; - if (LIST_EMPTY(&fn->nexthops)) { RB_FOREACH(ln, nbr_tree, &lde_nbrs) lde_send_labelwithdraw(ln, fn, NULL, NULL); |