diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-12-04 18:52:49 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-12-04 19:44:37 +0100 |
| commit | 3ee39b5ba0c9c60a7067d53dd21ff8dd7304b376 (patch) | |
| tree | 564a13c1ca19c0ddcab1f113e01766010266858b /lib/nexthop.c | |
| parent | zebra: Remove STATIC_XXX_IFNAME and use _IFINDEX (diff) | |
| download | frr-3ee39b5ba0c9c60a7067d53dd21ff8dd7304b376.tar.xz frr-3ee39b5ba0c9c60a7067d53dd21ff8dd7304b376.zip | |
ZEBRA: Remove NEXTHOP_TYPE_XXX_IFNAME
The NEXTHOP_TYPE_XXX_IFNAME types were never being used. Remove them
and the code associated with them.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'lib/nexthop.c')
| -rw-r--r-- | lib/nexthop.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/nexthop.c b/lib/nexthop.c index 5eb2182de..2a8d343a8 100644 --- a/lib/nexthop.c +++ b/lib/nexthop.c @@ -50,23 +50,19 @@ nexthop_same_no_recurse (struct nexthop *next1, struct nexthop *next2) return 0; break; case NEXTHOP_TYPE_IFINDEX: - case NEXTHOP_TYPE_IFNAME: if (next1->ifindex != next2->ifindex) return 0; break; -#ifdef HAVE_IPV6 case NEXTHOP_TYPE_IPV6: if (! IPV6_ADDR_SAME (&next1->gate.ipv6, &next2->gate.ipv6)) return 0; break; case NEXTHOP_TYPE_IPV6_IFINDEX: - case NEXTHOP_TYPE_IPV6_IFNAME: if (! IPV6_ADDR_SAME (&next1->gate.ipv6, &next2->gate.ipv6)) return 0; if (next1->ifindex != next2->ifindex) return 0; break; -#endif /* HAVE_IPV6 */ default: /* do nothing */ break; @@ -132,8 +128,6 @@ copy_nexthops (struct nexthop **tnh, struct nexthop *nh) nexthop->flags = nh->flags; nexthop->type = nh->type; nexthop->ifindex = nh->ifindex; - if (nh->ifname) - nexthop->ifname = XSTRDUP(0, nh->ifname); memcpy(&(nexthop->gate), &(nh->gate), sizeof(union g_addr)); memcpy(&(nexthop->src), &(nh->src), sizeof(union g_addr)); nexthop_add(tnh, nexthop); @@ -147,8 +141,6 @@ copy_nexthops (struct nexthop **tnh, struct nexthop *nh) void nexthop_free (struct nexthop *nexthop) { - if (nexthop->ifname) - XFREE (0, nexthop->ifname); if (nexthop->resolved) nexthops_free(nexthop->resolved); XFREE (MTYPE_NEXTHOP, nexthop); |