zebra: Remove HAVE_IPV6 from rib.h and zebra_rib.c
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
diff --git a/zebra/rib.h b/zebra/rib.h
index 408ceb4..1d3c15c 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -309,7 +309,7 @@
# define RTADV
#endif
-#if defined (HAVE_IPV6) && defined (RTADV)
+#if defined (RTADV)
/* Structure which hold status of router advertisement. */
struct rtadv
{
@@ -321,7 +321,7 @@
struct thread *ra_read;
struct thread *ra_timer;
};
-#endif /* RTADV && HAVE_IPV6 */
+#endif /* RTADV */
#ifdef HAVE_NETLINK
/* Socket interface to kernel */
@@ -370,9 +370,9 @@
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 */
};
/*
@@ -451,9 +451,7 @@
#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_alloc (vrf_id_t);
extern struct route_table *zebra_vrf_table (afi_t, safi_t, vrf_id_t);
@@ -498,7 +496,6 @@
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,
@@ -524,8 +521,6 @@
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 5096559..516d9d9 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -259,7 +259,6 @@
return nexthop;
}
-#ifdef HAVE_IPV6
struct nexthop *
nexthop_ipv6_add (struct rib *rib, struct in6_addr *ipv6)
{
@@ -305,7 +304,6 @@
return nexthop;
}
-#endif /* HAVE_IPV6 */
struct nexthop *
nexthop_blackhole_add (struct rib *rib)
@@ -483,7 +481,6 @@
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
@@ -618,7 +615,6 @@
}
return 0;
}
-#endif /* HAVE_IPV6 */
struct rib *
rib_match_ipv4_safi (struct in_addr addr, safi_t safi, int skip_bgp,
@@ -886,7 +882,6 @@
return ZEBRA_RIB_NOTFOUND;
}
-#ifdef HAVE_IPV6
struct rib *
rib_match_ipv6 (struct in6_addr *addr, vrf_id_t vrf_id)
{
@@ -949,7 +944,6 @@
}
return NULL;
}
-#endif /* HAVE_IPV6 */
#define RIB_SYSTEM_ROUTE(R) \
((R)->type == ZEBRA_ROUTE_KERNEL || (R)->type == ZEBRA_ROUTE_CONNECT)
@@ -1010,7 +1004,6 @@
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))
@@ -1036,7 +1029,6 @@
UNSET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);
}
break;
-#endif /* HAVE_IPV6 */
case NEXTHOP_TYPE_BLACKHOLE:
SET_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE);
break;
@@ -2597,7 +2589,6 @@
return 1;
}
-#ifdef HAVE_IPV6
int
rib_add_ipv6 (int type, int flags, struct prefix_ipv6 *p,
struct in6_addr *gate, unsigned int ifindex,
@@ -3131,7 +3122,6 @@
return 1;
}
-#endif /* HAVE_IPV6 */
/* RIB update function. */
void