You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/02/02 14:19:11 UTC
[incubator-nuttx] 04/04: Remove NETDEV_LOOPBACK option,
NET_LOOPBACK is enough
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr200
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 014ed3c3783c1525aaa473eb6ff41c80dcd510b4
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Feb 2 14:15:24 2020 +0800
Remove NETDEV_LOOPBACK option, NET_LOOPBACK is enough
Change-Id: Idc3acfc3a6b584cbcbdd151be50b6a1b0b0593b6
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
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 14a287a..3ad5ff8 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 867d0ea..8378ac4 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 1b44f61..3e588fd 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 b60662e..3456578 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 8c140e0..5609a5f 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 cf8e761..0993bcf 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 124cc39..94a586f 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 35498b6..432672b 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 75fd8b7..922b4a5 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 0e4e0ba..4da1978 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 4d42fa2..c93c776 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 db05318..68b5b84 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 bf8e314..c5078e0 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 d990d68..88a5d05 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -62,13 +62,13 @@
# include <nuttx/net/pkt.h>
#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 4a13140..762e4c8 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 03bc0a3..1dce9fc 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 306268a..e7c6973 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.