Merge pull request #68 from donaldsharp/cleanup

Cleanup

diff --cc bgpd/bgp_mpath.c
index dc8904ced28d5ab959a424248b96254bbb2081e0,208f676f1abcc4ff2d367b227ea3629cef564c00..1701c70441486e9a7215cb1c52ffce7adc246374
--- 1/bgpd/bgp_mpath.c
--- 2/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 ae448d6ec59a462122aab3561d7153ee719df858,b25101f28fac1789330421b5c8497965c19158e9..d2abb40ca9f6eea02200cfab73dc105fb960e2cd
--- 1/bgpd/bgp_route.c
--- 2/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));