diff options
| author | Lou Berger <lberger@labn.net> | 2016-01-12 13:42:11 -0500 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@hpe.com> | 2016-02-26 14:11:45 +0000 |
| commit | 205e6744f2dc2909dd494c9ce8acb82821459f1f (patch) | |
| tree | a996419a840766d2ffa1025805e1be84a2dacdf4 /bgpd/bgp_mpath.c | |
| parent | 544ec70f66d0ec081dadde79bec1f25c2241f57f (diff) | |
| download | quagga-205e6744f2dc2909dd494c9ce8acb82821459f1f.tar.bz2 quagga-205e6744f2dc2909dd494c9ce8acb82821459f1f.tar.xz | |
bgpd: remove HAVE_IPV6 conditionals
Signed-off-by: Lou Berger <lberger@labn.net>
Tested-by: NetDEF CI System <cisystem@netdef.org>
Diffstat (limited to 'bgpd/bgp_mpath.c')
| -rw-r--r-- | bgpd/bgp_mpath.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c index 9eaf3c26..73b93ceb 100644 --- a/bgpd/bgp_mpath.c +++ b/bgpd/bgp_mpath.c @@ -148,7 +148,6 @@ bgp_info_nexthop_cmp (struct bgp_info *bi1, struct bgp_info *bi2) compare = IPV4_ADDR_CMP (&ae1->mp_nexthop_global_in, &ae2->mp_nexthop_global_in); break; -#ifdef HAVE_IPV6 case 16: compare = IPV6_ADDR_CMP (&ae1->mp_nexthop_global, &ae2->mp_nexthop_global); @@ -160,7 +159,6 @@ bgp_info_nexthop_cmp (struct bgp_info *bi1, struct bgp_info *bi2) compare = IPV6_ADDR_CMP (&ae1->mp_nexthop_local, &ae2->mp_nexthop_local); break; -#endif /* HAVE_IPV6 */ } } @@ -746,10 +744,8 @@ bgp_info_mpath_aggregate_update (struct bgp_info *new_best, /* Zap multipath attr nexthop so we set nexthop to self */ attr.nexthop.s_addr = 0; -#ifdef HAVE_IPV6 if (attr.extra) memset (&attr.extra->mp_nexthop_global, 0, sizeof (struct in6_addr)); -#endif /* HAVE_IPV6 */ /* TODO: should we set ATOMIC_AGGREGATE and AGGREGATOR? */ |