diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-10-23 12:31:25 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-10-23 12:31:25 +0200 |
| commit | 064518517c57024e65e177ee79c0a98f9f28ef6e (patch) | |
| tree | dcc1d14ad647a210ef2d93da4fe827d9337ada4b /zebra/zebra_mpls.c | |
| parent | 920b243c1b154476ab9a629ac002817ead5a1efa (diff) | |
| parent | d17743d390757c170bad6a776de43d1809afe3c3 (diff) | |
Merge branch 'pull/3197'
...with a nit fix
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'zebra/zebra_mpls.c')
| -rw-r--r-- | zebra/zebra_mpls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index 0ccd3242d5..5fe0116158 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -79,7 +79,7 @@ static zebra_fec_t *fec_add(struct route_table *table, struct prefix *p, static int fec_del(zebra_fec_t *fec); static unsigned int label_hash(void *p); -static int label_cmp(const void *p1, const void *p2); +static bool label_cmp(const void *p1, const void *p2); static int nhlfe_nexthop_active_ipv4(zebra_nhlfe_t *nhlfe, struct nexthop *nexthop); static int nhlfe_nexthop_active_ipv6(zebra_nhlfe_t *nhlfe, @@ -592,7 +592,7 @@ static unsigned int label_hash(void *p) /* * Compare 2 LSP hash entries based on in-label. */ -static int label_cmp(const void *p1, const void *p2) +static bool label_cmp(const void *p1, const void *p2) { const zebra_ile_t *ile1 = p1; const zebra_ile_t *ile2 = p2; |
