diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-02-01 00:24:06 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-02-09 02:31:37 +0100 |
| commit | 70e98a7fe7296a1279c6b7142e57221f71ff3121 (patch) | |
| tree | 77325f78eefb0c95c96d18f8f09fee296d55db35 /zebra/label_manager.c | |
| parent | zebra: Cleanup mpls handling to allow a NEXTHOP_TYPE_IFINDEX (diff) | |
| download | frr-70e98a7fe7296a1279c6b7142e57221f71ff3121.tar.xz frr-70e98a7fe7296a1279c6b7142e57221f71ff3121.zip | |
*: Make code use a consisten definition of labels
Turns out we had 3 different ways to define labels
all of them overlapping with the same meanings.
Consolidate to 1. This one choosen is consistent
naming wise with what the *bsd and linux kernels
use.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/label_manager.c')
| -rw-r--r-- | zebra/label_manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/label_manager.c b/zebra/label_manager.c index ace13eda7..5bf0fce09 100644 --- a/zebra/label_manager.c +++ b/zebra/label_manager.c @@ -283,13 +283,13 @@ struct label_manager_chunk *assign_label_chunk(u_char proto, u_short instance, return NULL; if (list_isempty(lbl_mgr.lc_list)) - lmc->start = MPLS_MIN_UNRESERVED_LABEL; + lmc->start = MPLS_LABEL_UNRESERVED_MIN; else lmc->start = ((struct label_manager_chunk *)listgetdata( listtail(lbl_mgr.lc_list))) ->end + 1; - if (lmc->start > MPLS_MAX_UNRESERVED_LABEL - size + 1) { + if (lmc->start > MPLS_LABEL_UNRESERVED_MAX - size + 1) { zlog_err("Reached max labels. Start: %u, size: %u", lmc->start, size); XFREE(MTYPE_LM_CHUNK, lmc); |