diff --git a/net/route/Make.defs b/net/route/Make.defs index bf1dfd8c73..b4e9bd0d34 100644 --- a/net/route/Make.defs +++ b/net/route/Make.defs @@ -35,7 +35,7 @@ ifeq ($(CONFIG_NET_ROUTE),y) -# General outing table support +# General routing table support SOCK_CSRCS += net_initroute.c net_router.c netdev_router.c diff --git a/net/route/net_add_ramroute.c b/net/route/net_add_ramroute.c index 1e4b7c1553..219f763f50 100644 --- a/net/route/net_add_ramroute.c +++ b/net/route/net_add_ramroute.c @@ -52,7 +52,7 @@ #include "route/ramroute.h" #include "route/route.h" -#ifdef CONFIG_NET_ROUTE +#if defined(CONFIG_ROUTE_IPv4_RAMROUTE) || defined(CONFIG_ROUTE_IPv6_RAMROUTE) /**************************************************************************** * Public Functions @@ -140,4 +140,4 @@ int net_addroute_ipv6(net_ipv6addr_t target, net_ipv6addr_t netmask, } #endif -#endif /* CONFIG_NET_ROUTE */ +#endif /* CONFIG_ROUTE_IPv4_RAMROUTE || CONFIG_ROUTE_IPv6_RAMROUTE */ diff --git a/net/route/net_del_ramroute.c b/net/route/net_del_ramroute.c index b486674d0b..0646fccfbc 100644 --- a/net/route/net_del_ramroute.c +++ b/net/route/net_del_ramroute.c @@ -50,7 +50,7 @@ #include "route/ramroute.h" #include "route/route.h" -#if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) +#if defined(CONFIG_ROUTE_IPv4_RAMROUTE) || defined(CONFIG_ROUTE_IPv6_RAMROUTE) /**************************************************************************** * Public Types @@ -242,4 +242,4 @@ int net_delroute_ipv6(net_ipv6addr_t target, net_ipv6addr_t netmask) } #endif -#endif /* CONFIG_NET && CONFIG_NET_ROUTE */ +#endif /* CONFIG_ROUTE_IPv4_RAMROUTE || CONFIG_ROUTE_IPv6_RAMROUTE */ diff --git a/net/route/net_foreach_ramroute.c b/net/route/net_foreach_ramroute.c index 02e5fa93d1..c28eeddbfd 100644 --- a/net/route/net_foreach_ramroute.c +++ b/net/route/net_foreach_ramroute.c @@ -49,7 +49,7 @@ #include "route/ramroute.h" #include "route/route.h" -#ifdef CONFIG_NET_ROUTE +#if defined(CONFIG_ROUTE_IPv4_RAMROUTE) || defined(CONFIG_ROUTE_IPv6_RAMROUTE) /**************************************************************************** * Public Functions @@ -130,4 +130,4 @@ int net_foreachroute_ipv6(route_handler_ipv6_t handler, FAR void *arg) } #endif -#endif /* CONFIG_NET_ROUTE */ +#endif /* CONFIG_ROUTE_IPv4_RAMROUTE || CONFIG_ROUTE_IPv6_RAMROUTE */ diff --git a/net/route/net_foreach_romroute.c b/net/route/net_foreach_romroute.c index cb7a1a07c3..f5aebaa3c3 100644 --- a/net/route/net_foreach_romroute.c +++ b/net/route/net_foreach_romroute.c @@ -46,7 +46,7 @@ #include "route/romroute.h" #include "route/route.h" -#ifdef CONFIG_NET_ROUTE +#if defined(CONFIG_ROUTE_IPv4_ROMROUTE) || defined(CONFIG_ROUTE_IPv6_ROMROUTE) /**************************************************************************** * Public Functions @@ -105,4 +105,4 @@ int net_foreachroute_ipv6(route_handler_ipv6_t handler, FAR void *arg) } #endif -#endif /* CONFIG_NET_ROUTE */ +#endif /* CONFIG_ROUTE_IPv4_ROMROUTE || CONFIG_ROUTE_IPv6_ROMROUTE */ diff --git a/net/route/net_queue_ramroute.c b/net/route/net_queue_ramroute.c index 7535eb1f90..f1fd9065ed 100644 --- a/net/route/net_queue_ramroute.c +++ b/net/route/net_queue_ramroute.c @@ -42,14 +42,6 @@ #include "route/ramroute.h" #include "route/route.h" -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/net/route/ramroute.h b/net/route/ramroute.h index df03e3186f..37d177536c 100644 --- a/net/route/ramroute.h +++ b/net/route/ramroute.h @@ -44,6 +44,8 @@ #include "route/route.h" +#if defined(CONFIG_ROUTE_IPv4_RAMROUTE) || defined(CONFIG_ROUTE_IPv6_RAMROUTE) + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -229,4 +231,5 @@ FAR struct net_route_ipv6_entry_s * struct net_route_ipv6_queue_s *list); #endif +#endif /* CONFIG_ROUTE_IPv4_RAMROUTE || CONFIG_ROUTE_IPv6_RAMROUTE */ #endif /* __NET_ROUTE_RAMROUTE_H */ diff --git a/net/route/romroute.h b/net/route/romroute.h index 9bd210ca66..c1c1955a20 100644 --- a/net/route/romroute.h +++ b/net/route/romroute.h @@ -44,6 +44,8 @@ #include "route/route.h" +#if defined(CONFIG_ROUTE_IPv4_ROMROUTE) || defined(CONFIG_ROUTE_IPv6_ROMROUTE) + /**************************************************************************** * Public Data ****************************************************************************/ @@ -60,7 +62,7 @@ extern const unsigned int g_ipv4_nroutes; #endif #if defined(CONFIG_ROUTE_IPv6_ROMROUTE) -/* The in-memory routing tables are represented as asimple array. */ +/* The in-memory routing tables are represented as a simple array. */ extern struct net_route_ipv6_s g_ipv6_routes[]; extern const unsigned int g_ipv6_nroutes; @@ -70,4 +72,5 @@ extern const unsigned int g_ipv6_nroutes; * Public Functions ****************************************************************************/ +#endif /* CONFIG_ROUTE_IPv4_ROMROUTE || CONFIG_ROUTE_IPv6_ROMROUTE */ #endif /* __NET_ROUTE_ROMROUTE_H */