diff options
| author | vivek <vivek@cumulusnetworks.com> | 2015-12-08 17:01:20 -0800 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2015-12-08 17:01:20 -0800 |
| commit | 3d63d59fd1ac70e3bdfc243a40d1cfbc5c547ac6 (patch) | |
| tree | 2a90fc4f84ed361d8509a52aa33e1b9a926adcdf /lib/nexthop.c | |
| parent | 1c8481370f49d491d5afe84af9bf8613b257afb2 (diff) | |
| parent | ef16372d77e3822c13f23370e55a280b784aeef2 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
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 5eb2182de0..2a8d343a8c 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); |