sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor cleanup after laster squashed merge.

Browse Source
This commit is contained in:
Gregory Nutt 2017-09-28 09:23:03 -06:00
parent 3aa18ef56e
commit 467c31637f
8 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/route/Make.defs
View File

@ -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

4
net/route/net_add_ramroute.c
View File

@ -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 */

4
net/route/net_del_ramroute.c
View File

@ -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 */

4
net/route/net_foreach_ramroute.c
View File

@ -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 */

4
net/route/net_foreach_romroute.c
View File

@ -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 */

8
net/route/net_queue_ramroute.c
View File

@ -42,14 +42,6 @@
#include "route/ramroute.h"
#include "route/route.h"
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/

3
net/route/ramroute.h
View File

@ -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 */

5
net/route/romroute.h
View File

@ -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 */