diff options
| author | Olivier Dugeon <olivier.dugeon@orange.com> | 2017-01-16 15:12:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 15:12:55 +0100 |
| commit | ab0c9543a9f3337b1d99727a438d1293ef8b2956 (patch) | |
| tree | 529e6476fdcd48500bcca77ef77b3d68da23f1c6 /bgpd/bgp_mpath.c | |
| parent | Merge pull request #70 from pguibert6WIND/frr_6wind_vpnv6_2 (diff) | |
| parent | zebra: Some code cleanup based upon Review. (diff) | |
| download | frr-ab0c9543a9f3337b1d99727a438d1293ef8b2956.tar.xz frr-ab0c9543a9f3337b1d99727a438d1293ef8b2956.zip | |
Merge pull request #68 from donaldsharp/cleanup
Cleanup
Diffstat (limited to 'bgpd/bgp_mpath.c')
| -rw-r--r-- | bgpd/bgp_mpath.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c index dc8904ced..1701c7044 100644 --- a/bgpd/bgp_mpath.c +++ b/bgpd/bgp_mpath.c @@ -124,7 +124,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 BGP_ATTR_NHLEN_IPV6_GLOBAL: case BGP_ATTR_NHLEN_VPNV6_GLOBAL: compare = IPV6_ADDR_CMP (&ae1->mp_nexthop_global, @@ -137,11 +136,9 @@ 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 */ } } -#ifdef HAVE_IPV6 /* This can happen if one IPv6 peer sends you global and link-local * nexthops but another IPv6 peer only sends you global */ @@ -158,7 +155,6 @@ bgp_info_nexthop_cmp (struct bgp_info *bi1, struct bgp_info *bi2) compare = 1; } } -#endif /* HAVE_IPV6 */ } return compare; @@ -755,10 +751,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? */ } |