luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove NETDEV_LOOPBACK option, NET_LOOPBACK is enough

Browse source
This commit is contained in:
Xiang Xiao 2020-02-02 14:15:24 +08:00 • committed by Gregory Nutt
parent 2d7c072723
commit c5b1554d84
17 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/src/common/up_initialize.c
View file

@ -247,7 +247,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/avr/src/common/up_initialize.c
View file

@ -285,7 +285,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/hc/src/common/up_initialize.c
View file

@ -207,7 +207,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/mips/src/common/up_initialize.c
View file

@ -209,7 +209,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/or1k/src/common/up_initialize.c
View file

@ -305,7 +305,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/renesas/src/common/up_initialize.c
View file

@ -193,7 +193,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/sim/src/sim/up_initialize.c
View file

@ -274,7 +274,7 @@ void up_initialize(void)
netdriver_init(); /* Our "real" network driver */ netdriver_init(); /* Our "real" network driver */
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/x86/src/common/up_initialize.c
View file

@ -209,7 +209,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/xtensa/src/common/xtensa_initialize.c
View file

@ -217,7 +217,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/z16/src/common/up_initialize.c
View file

@ -209,7 +209,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

2
arch/z80/src/common/up_initialize.c
View file

@ -214,7 +214,7 @@ void up_initialize(void)
up_netinitialize(); up_netinitialize();
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/* Initialize the local loopback device */ /* Initialize the local loopback device */
localhost_initialize(); localhost_initialize();

11
drivers/net/Kconfig
View file

@ -5,17 +5,6 @@
comment "General Ethernet MAC Driver Options" comment "General Ethernet MAC Driver Options"
config NETDEV_LOOPBACK
bool
default n if !NET_LOOPBACK
default y if NET_LOOPBACK
select ARCH_HAVE_NETDEV_STATISTICS
---help---
Add support for the local network loopback device, lo.
if NETDEV_LOOPBACK
endif # NETDEV_LOOPBACK
config NET_RPMSG_DRV config NET_RPMSG_DRV
bool "RPMSG net driver" bool "RPMSG net driver"
depends on NET && OPENAMP depends on NET && OPENAMP

2
drivers/net/Make.defs
View file

@ -39,7 +39,7 @@ ifeq ($(CONFIG_NET),y)
# Include network interface drivers # Include network interface drivers
ifeq ($(CONFIG_NETDEV_LOOPBACK),y) ifeq ($(CONFIG_NET_LOOPBACK),y)
CSRCS += loopback.c CSRCS += loopback.c
endif endif

8
drivers/net/loopback.c
View file

@ -62,13 +62,13 @@
# include <nuttx/net/pkt.h> # include <nuttx/net/pkt.h>
#endif #endif
#ifdef CONFIG_NETDEV_LOOPBACK #ifdef CONFIG_NET_LOOPBACK
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* We need to have the work queue to handle SPI interrupts */ /* We need to have the work queue to handle interrupts */
#if !defined(CONFIG_SCHED_WORKQUEUE) #if !defined(CONFIG_SCHED_WORKQUEUE)
# error Worker thread support is required (CONFIG_SCHED_WORKQUEUE) # error Worker thread support is required (CONFIG_SCHED_WORKQUEUE)
@ -78,7 +78,7 @@
#define LO_WDDELAY (1*CLK_TCK) #define LO_WDDELAY (1*CLK_TCK)
/* This is a helper pointer for accessing the contents of the Ethernet header */ /* This is a helper pointer for accessing the contents of the IP header */
#define IPv4BUF ((FAR struct ipv4_hdr_s *)priv->lo_dev.d_buf) #define IPv4BUF ((FAR struct ipv4_hdr_s *)priv->lo_dev.d_buf)
#define IPv6BUF ((FAR struct ipv6_hdr_s *)priv->lo_dev.d_buf) #define IPv6BUF ((FAR struct ipv6_hdr_s *)priv->lo_dev.d_buf)
@ -552,4 +552,4 @@ int localhost_initialize(void)
return lo_ifup(&priv->lo_dev); return lo_ifup(&priv->lo_dev);
} }
#endif /* CONFIG_NETDEV_LOOPBACK */ #endif /* CONFIG_NET_LOOPBACK */

2
fs/userfs/Kconfig
View file

@ -6,7 +6,7 @@
config FS_USERFS config FS_USERFS
bool "User file system" bool "User file system"
default n default n
depends on NET_IPv4 && NET_UDP && NETDEV_LOOPBACK depends on NET_IPv4 && NET_UDP && NET_LOOPBACK
---help--- ---help---
Enable support for user file system. See include/nuttx/fs/userfs.h Enable support for user file system. See include/nuttx/fs/userfs.h

2
include/nuttx/net/loopback.h
View file

@ -99,9 +99,7 @@ EXTERN const net_ipv6addr_t g_lo_ipv6mask;
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NETDEV_LOOPBACK
int localhost_initialize(void); int localhost_initialize(void);
#endif /* CONFIG_NETDEV_LOOPBACK */
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus

1
net/Kconfig
View file

@ -123,6 +123,7 @@ config NET_ETHERNET
config NET_LOOPBACK config NET_LOOPBACK
bool "Local loopback" bool "Local loopback"
select ARCH_HAVE_NETDEV_STATISTICS
default n default n
---help--- ---help---
Add support for the local network loopback device, lo. Add support for the local network loopback device, lo.