From c5b1554d84bc4990667fb91fdf6276e2b258f501 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 2 Feb 2020 14:15:24 +0800 Subject: [PATCH] Remove NETDEV_LOOPBACK option, NET_LOOPBACK is enough --- arch/arm/src/common/up_initialize.c | 2 +- arch/avr/src/common/up_initialize.c | 2 +- arch/hc/src/common/up_initialize.c | 2 +- arch/mips/src/common/up_initialize.c | 2 +- arch/or1k/src/common/up_initialize.c | 2 +- arch/renesas/src/common/up_initialize.c | 2 +- arch/sim/src/sim/up_initialize.c | 2 +- arch/x86/src/common/up_initialize.c | 2 +- arch/xtensa/src/common/xtensa_initialize.c | 2 +- arch/z16/src/common/up_initialize.c | 2 +- arch/z80/src/common/up_initialize.c | 2 +- drivers/net/Kconfig | 11 ----------- drivers/net/Make.defs | 2 +- drivers/net/loopback.c | 8 ++++---- fs/userfs/Kconfig | 2 +- include/nuttx/net/loopback.h | 2 -- net/Kconfig | 1 + 17 files changed, 18 insertions(+), 30 deletions(-) diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index 14a287a5ed..3ad5ff880f 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -247,7 +247,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 867d0eafc5..8378ac49f3 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -285,7 +285,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index 1b44f61444..3e588fd9b1 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -207,7 +207,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index b60662e824..345657822a 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/arch/mips/src/common/up_initialize.c @@ -209,7 +209,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c index 8c140e01d4..5609a5f405 100644 --- a/arch/or1k/src/common/up_initialize.c +++ b/arch/or1k/src/common/up_initialize.c @@ -305,7 +305,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c index cf8e7617fe..0993bcf67f 100644 --- a/arch/renesas/src/common/up_initialize.c +++ b/arch/renesas/src/common/up_initialize.c @@ -193,7 +193,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/sim/src/sim/up_initialize.c b/arch/sim/src/sim/up_initialize.c index 124cc39ecb..94a586ff99 100644 --- a/arch/sim/src/sim/up_initialize.c +++ b/arch/sim/src/sim/up_initialize.c @@ -274,7 +274,7 @@ void up_initialize(void) netdriver_init(); /* Our "real" network driver */ #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index 35498b64d5..432672be3f 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -209,7 +209,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c index 75fd8b7ba6..922b4a528b 100644 --- a/arch/xtensa/src/common/xtensa_initialize.c +++ b/arch/xtensa/src/common/xtensa_initialize.c @@ -217,7 +217,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index 0e4e0ba67d..4da19789c2 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/arch/z16/src/common/up_initialize.c @@ -209,7 +209,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index 4d42fa221a..c93c776bb3 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/up_initialize.c @@ -214,7 +214,7 @@ void up_initialize(void) up_netinitialize(); #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /* Initialize the local loopback device */ localhost_initialize(); diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index db0531890c..68b5b84399 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -5,17 +5,6 @@ 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 bool "RPMSG net driver" depends on NET && OPENAMP diff --git a/drivers/net/Make.defs b/drivers/net/Make.defs index bf8e314d68..c5078e0077 100644 --- a/drivers/net/Make.defs +++ b/drivers/net/Make.defs @@ -39,7 +39,7 @@ ifeq ($(CONFIG_NET),y) # Include network interface drivers -ifeq ($(CONFIG_NETDEV_LOOPBACK),y) +ifeq ($(CONFIG_NET_LOOPBACK),y) CSRCS += loopback.c endif diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index d990d6856b..88a5d057c3 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -62,13 +62,13 @@ # include #endif -#ifdef CONFIG_NETDEV_LOOPBACK +#ifdef CONFIG_NET_LOOPBACK /**************************************************************************** * 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) # error Worker thread support is required (CONFIG_SCHED_WORKQUEUE) @@ -78,7 +78,7 @@ #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 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); } -#endif /* CONFIG_NETDEV_LOOPBACK */ +#endif /* CONFIG_NET_LOOPBACK */ diff --git a/fs/userfs/Kconfig b/fs/userfs/Kconfig index 4a13140b8b..762e4c85e2 100644 --- a/fs/userfs/Kconfig +++ b/fs/userfs/Kconfig @@ -6,7 +6,7 @@ config FS_USERFS bool "User file system" default n - depends on NET_IPv4 && NET_UDP && NETDEV_LOOPBACK + depends on NET_IPv4 && NET_UDP && NET_LOOPBACK ---help--- Enable support for user file system. See include/nuttx/fs/userfs.h diff --git a/include/nuttx/net/loopback.h b/include/nuttx/net/loopback.h index 03bc0a3dc1..1dce9fc1d4 100644 --- a/include/nuttx/net/loopback.h +++ b/include/nuttx/net/loopback.h @@ -99,9 +99,7 @@ EXTERN const net_ipv6addr_t g_lo_ipv6mask; * ****************************************************************************/ -#ifdef CONFIG_NETDEV_LOOPBACK int localhost_initialize(void); -#endif /* CONFIG_NETDEV_LOOPBACK */ #undef EXTERN #ifdef __cplusplus diff --git a/net/Kconfig b/net/Kconfig index 306268a3c6..e7c697347e 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -123,6 +123,7 @@ config NET_ETHERNET config NET_LOOPBACK bool "Local loopback" + select ARCH_HAVE_NETDEV_STATISTICS default n ---help--- Add support for the local network loopback device, lo.