diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-01-21 22:11:50 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-01-22 17:55:22 +0100 |
| commit | 8ecdb26ec08cc66ade06e3d325fceaae7bed76f2 (patch) | |
| tree | 4b057889f07c7e04293f3529d5c2a22f6f320d3d /lib/nexthop.c | |
| parent | Merge pull request #1651 from donaldsharp/redhat_build_fpm (diff) | |
| download | frr-8ecdb26ec08cc66ade06e3d325fceaae7bed76f2.tar.xz frr-8ecdb26ec08cc66ade06e3d325fceaae7bed76f2.zip | |
lib, zebra: Rename and place appropriately the label stack
Fix and rename the label stack to be better named.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'lib/nexthop.c')
| -rw-r--r-- | lib/nexthop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/nexthop.c b/lib/nexthop.c index f6b2c9788..f531f2730 100644 --- a/lib/nexthop.c +++ b/lib/nexthop.c @@ -124,7 +124,7 @@ const char *nexthop_type_to_str(enum nexthop_types_t nh_type) */ int nexthop_labels_match(struct nexthop *nh1, struct nexthop *nh2) { - struct nexthop_label *nhl1, *nhl2; + struct mpls_label_stack *nhl1, *nhl2; nhl1 = nh1->nh_label; nhl2 = nh2->nh_label; @@ -210,12 +210,12 @@ void nexthops_free(struct nexthop *nexthop) void nexthop_add_labels(struct nexthop *nexthop, enum lsp_types_t type, u_int8_t num_labels, mpls_label_t *label) { - struct nexthop_label *nh_label; + struct mpls_label_stack *nh_label; int i; nexthop->nh_label_type = type; nh_label = XCALLOC(MTYPE_NH_LABEL, - sizeof(struct nexthop_label) + sizeof(struct mpls_label_stack) + num_labels * sizeof(mpls_label_t)); nh_label->num_labels = num_labels; for (i = 0; i < num_labels; i++) |