From: Olivier Dugeon <olivier.dugeon@orange.com>
Date: Mon, 16 Jan 2017 14:12:55 +0000 (+0100)
Subject: Merge pull request #68 from donaldsharp/cleanup
X-Git-Tag: frr-3.0-branchpoint~87
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ab0c9543a9f3337b1d99727a438d1293ef8b2956;p=matthieu%2Ffrr.git

Merge pull request #68 from donaldsharp/cleanup

Cleanup
---

ab0c9543a9f3337b1d99727a438d1293ef8b2956
diff --cc bgpd/bgp_mpath.c
index dc8904ced2,208f676f1a..1701c70441
--- a/bgpd/bgp_mpath.c
+++ b/bgpd/bgp_mpath.c
@@@ -124,9 -125,7 +124,8 @@@ bgp_info_nexthop_cmp (struct bgp_info *
                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,
                                         &ae2->mp_nexthop_global);
                break;
diff --cc bgpd/bgp_route.c
index ae448d6ec5,b25101f28f..d2abb40ca9
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -2320,10 -2314,8 +2314,9 @@@ bgp_update_martian_nexthop (struct bgp 
                   IPV4_CLASS_DE (ntohl (attre->mp_nexthop_global_in.s_addr)));
            break;
  
- #ifdef HAVE_IPV6
          case BGP_ATTR_NHLEN_IPV6_GLOBAL:
          case BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL:
 +        case BGP_ATTR_NHLEN_VPNV6_GLOBAL:
            ret = (IN6_IS_ADDR_UNSPECIFIED(&attre->mp_nexthop_global) ||
                   IN6_IS_ADDR_LOOPBACK(&attre->mp_nexthop_global)    ||
                   IN6_IS_ADDR_MULTICAST(&attre->mp_nexthop_global));