Signed-off-by: Donald Sharp <[email protected]>
---
zebra/rib.h | 13 ++++---------
zebra/zebra_rib.c | 12 ------------
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/zebra/rib.h b/zebra/rib.h
index 1b99d8b..072a368 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -262,7 +262,7 @@ struct nexthop_vrfid
#endif
#endif
-#if defined (HAVE_IPV6) && defined (RTADV)
+#if defined (RTADV)
/* Structure which hold status of router advertisement. */
struct rtadv
{
@@ -274,7 +274,7 @@ struct rtadv
struct thread *ra_read;
struct thread *ra_timer;
};
-#endif /* RTADV && HAVE_IPV6 */
+#endif /* RTADV */
#ifdef HAVE_NETLINK
/* Socket interface to kernel */
@@ -326,9 +326,9 @@ struct zebra_vrf
struct list *rid_lo_sorted_list;
struct prefix rid_user_assigned;
-#if defined (HAVE_IPV6) && defined (RTADV)
+#if defined (RTADV)
struct rtadv rtadv;
-#endif /* RTADV && HAVE_IPV6 */
+#endif /* RTADV */
};
/*
@@ -411,9 +411,7 @@ extern int rib_lookup_ipv4_route (struct prefix_ipv4 *,
union sockunion *,
#define ZEBRA_RIB_FOUND_CONNECTED 2
#define ZEBRA_RIB_NOTFOUND 3
-#ifdef HAVE_IPV6
extern struct nexthop *nexthop_ipv6_add (struct rib *, struct in6_addr *);
-#endif /* HAVE_IPV6 */
extern struct zebra_vrf *zebra_vrf_lookup (vrf_id_t vrf_id);
extern struct zebra_vrf *zebra_vrf_alloc (vrf_id_t);
@@ -459,7 +457,6 @@ extern int
static_delete_ipv4_safi (safi_t safi, struct prefix *p, struct in_addr *gate,
const char *ifname, u_char distance, vrf_id_t vrf_id);
-#ifdef HAVE_IPV6
extern int
rib_add_ipv6 (int type, int flags, struct prefix_ipv6 *p,
struct in6_addr *gate, unsigned int ifindex, vrf_id_t vrf_id,
@@ -484,8 +481,6 @@ extern int
static_delete_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate,
const char *ifname, u_char distance, vrf_id_t vrf_id);
-#endif /* HAVE_IPV6 */
-
extern int rib_gc_dest (struct route_node *rn);
extern struct route_table *rib_tables_iter_next (rib_tables_iter_t *iter);
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 8f34d47..be4ac5b 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -263,7 +263,6 @@ nexthop_ipv4_ifindex_add (struct rib *rib, struct in_addr
*ipv4,
return nexthop;
}
-#ifdef HAVE_IPV6
struct nexthop *
nexthop_ipv6_add (struct rib *rib, struct in6_addr *ipv6)
{
@@ -309,7 +308,6 @@ nexthop_ipv6_ifindex_add (struct rib *rib, struct in6_addr
*ipv6,
return nexthop;
}
-#endif /* HAVE_IPV6 */
struct nexthop *
nexthop_blackhole_add (struct rib *rib)
@@ -476,7 +474,6 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop
*nexthop, int set,
return 0;
}
-#ifdef HAVE_IPV6
/* If force flag is not set, do not modify falgs at all for uninstall
the route from FIB. */
static int
@@ -609,7 +606,6 @@ nexthop_active_ipv6 (struct rib *rib, struct nexthop
*nexthop, int set,
}
return 0;
}
-#endif /* HAVE_IPV6 */
struct rib *
rib_match_ipv4_safi (struct in_addr addr, safi_t safi, int skip_bgp,
@@ -877,7 +873,6 @@ rib_lookup_ipv4_route (struct prefix_ipv4 *p, union
sockunion * qgate,
return ZEBRA_RIB_NOTFOUND;
}
-#ifdef HAVE_IPV6
struct rib *
rib_match_ipv6 (struct in6_addr *addr, vrf_id_t vrf_id)
{
@@ -938,7 +933,6 @@ rib_match_ipv6 (struct in6_addr *addr, vrf_id_t vrf_id)
}
return NULL;
}
-#endif /* HAVE_IPV6 */
#define RIB_SYSTEM_ROUTE(R) \
((R)->type == ZEBRA_ROUTE_KERNEL || (R)->type == ZEBRA_ROUTE_CONNECT)
@@ -999,7 +993,6 @@ nexthop_active_check (struct route_node *rn, struct rib
*rib,
else
UNSET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);
break;
-#ifdef HAVE_IPV6
case NEXTHOP_TYPE_IPV6:
family = AFI_IP6;
if (nexthop_active_ipv6 (rib, nexthop, set, rn))
@@ -1025,7 +1018,6 @@ nexthop_active_check (struct route_node *rn, struct rib
*rib,
UNSET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);
}
break;
-#endif /* HAVE_IPV6 */
case NEXTHOP_TYPE_BLACKHOLE:
SET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);
break;
@@ -1448,9 +1440,7 @@ static void
meta_queue_process_complete (struct work_queue *dummy)
{
zebra_evaluate_rnh_table(0, AF_INET, 0);
-#ifdef HAVE_IPV6
zebra_evaluate_rnh_table(0, AF_INET6, 0);
-#endif /* HAVE_IPV6 */
}
/* Dispatch the meta queue by picking, processing and unlocking the next RN
from
@@ -2545,7 +2535,6 @@ static_delete_ipv4_safi (safi_t safi, struct prefix *p,
struct in_addr *gate,
return 1;
}
-#ifdef HAVE_IPV6
int
rib_add_ipv6 (int type, int flags, struct prefix_ipv6 *p,
struct in6_addr *gate, unsigned int ifindex,
@@ -3079,7 +3068,6 @@ static_delete_ipv6 (struct prefix *p, u_char type, struct
in6_addr *gate,
return 1;
}
-#endif /* HAVE_IPV6 */
/* RIB update function. */
void
--
1.7.10.4
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
