From 2d7c072723902aa763d3851f6399c39cbb1851fe Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 2 Feb 2020 14:20:43 +0800 Subject: [PATCH] Remove duplicated NET_SLIP option from drivers/net/Kconfig --- ChangeLog | 4 ++-- ReleaseNotes | 4 ++-- drivers/net/Kconfig | 33 --------------------------------- drivers/net/slip.c | 2 +- include/nuttx/net/slip.h | 2 +- net/Kconfig | 7 ++++++- 6 files changed, 12 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33cb6974a6..808be46ec1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15767,7 +15767,7 @@ Other TCP-specific issues also fixed. There remains a major outstanding issue with ACK handling. Handle case where the local address is zero (listen socket). Major re-architecting of TCP logic - to properly handle TCP stuf like ACKs and TPC windowing which were + to properly handle TCP stuf like ACKs and TCP windowing which were not properly covered in the initial design. Still does not work; hangs waiting of ACKs.Various fixes for a clean build if either TCP or UDP are disabled. Given the current state of TCP, it is @@ -17528,7 +17528,7 @@ use file-system in between. NOTE that this provides the opposite capability of FTL which will let you use an MTD interface directly as a block device. From Jussi Kivilinna (2017-10-19). - * There was a reference counting problem in the TPC logic of + * There was a reference counting problem in the TCP logic of net_clone(). net_clone() which is the common logic underlying dup() and dup2() for sockets. When net_clone() calls net_start_monitor() and net_start_monitor() returns a failure (because the underlying TCP diff --git a/ReleaseNotes b/ReleaseNotes index 4feea7fba7..59d4810e3a 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -16312,7 +16312,7 @@ detailed bugfix information): - sockgetname() files need to include udp/udp.h and tcp/tcp.h or otherwise NET_UDP_HAVE_STACK and NET_TCP_HAVE_STACK are undefined and the logic is never compiled. Noted by Anthony Merlino. - - dup()/dup2(): There was a reference counting problem in the TPC + - dup()/dup2(): There was a reference counting problem in the TCP logic of net_clone(). net_clone() which is the common logic underlying dup() and dup2() for sockets. When net_clone() calls net_start_monitor() and net_start_monitor() returns a failure @@ -20236,7 +20236,7 @@ detailed bugfix information): multicast address. Exiting logic only supported UDP multicast. But MLD and certain other ICMPv6 packets also require acceptance of multicast packets. From Gregory Nutt. - - TCP: In TPC recv window calculations, in order to receive data we + - TCP: In TCP recv window calculations, in order to receive data we must not only have IOBs available, but we must also have at least one IOB chain qentry available. Otherwise, we will advertise that we an buffer a lot of data when, in fact, we cannot. This is an diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index df323c25a9..db0531890c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -94,10 +94,6 @@ config TELNET_DUMPBUFFER endif # NETDEV_TELNET -config ARCH_HAVE_NETDEV_STATISTICS - bool - default n - config NETDEV_STATISTICS bool "Network device driver statistics" depends on NET_STATISTICS && ARCH_HAVE_NETDEV_STATISTICS @@ -307,35 +303,6 @@ config ENCX24J600_REGDEBUG endif # ENCX24J600 -menuconfig NET_SLIP - bool "SLIP (serial line) support" - default n - select ARCH_HAVE_NETDEV_STATISTICS - ---help--- - Reference: RFC 1055 - -if NET_SLIP - -config NET_SLIP_STACKSIZE - int "Daemon stack size" - default 2048 - ---help--- - Provides the stack size for SLIP RX and TX. - -config NET_SLIP_DEFPRIO - int "Daemon priority" - default 128 - ---help--- - Provides the priority for SLIP RX and TX threads. - -config NET_SLIP_NINTERFACES - int "Number of SLIP interfaces" - default 1 - ---help--- - Determines the number of physical interfaces that will be supported. - -endif - menuconfig NET_FTMAC100 bool "Faraday 10/100 Ethernet" default n diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 0972a9c9c2..d8307c0504 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -87,7 +87,7 @@ #endif /* The Linux slip module hard-codes its MTU size to 296 (40 bytes for the - * IP+TPC headers plus 256 bytes of data). So you might as well set + * IP+TCP headers plus 256 bytes of data). So you might as well set * CONFIG_NET_SLIP_PKTSIZE to 296 as well. * * There may be an issue with this setting, however. I see that Linux uses diff --git a/include/nuttx/net/slip.h b/include/nuttx/net/slip.h index 914f0ffd6b..0efae08b6e 100644 --- a/include/nuttx/net/slip.h +++ b/include/nuttx/net/slip.h @@ -62,7 +62,7 @@ * Default 296 * * The Linux slip module hard-codes its MTU size to 296 (40 bytes for the - * IP+TPC headers plus 256 bytes of data). So you might as well set + * IP+TCP headers plus 256 bytes of data). So you might as well set * CONFIG_NET_SLIP_PKTSIZE to 296 as well. * * There may be an issue with this setting, however. I see that Linux diff --git a/net/Kconfig b/net/Kconfig index 4c8d0dcec6..306268a3c6 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -11,6 +11,10 @@ config ARCH_HAVE_PHY bool default n +config ARCH_HAVE_NETDEV_STATISTICS + bool + default n + config NET_WRITE_BUFFERS bool default n @@ -84,7 +88,7 @@ config NET_SLIP_PKTSIZE 296 are not recommended. The Linux slip module hard-codes its MTU size to 296 (40 bytes for - the IP+TPC headers plus 256 bytes of data). So you might as well + the IP+TCP headers plus 256 bytes of data). So you might as well set CONFIG_NET_SLIP_PKTSIZE to 296 as well. There may be an issue with this setting, however. I see that Linux @@ -125,6 +129,7 @@ config NET_LOOPBACK menuconfig NET_SLIP bool "SLIP support" + select ARCH_HAVE_NETDEV_STATISTICS default n ---help--- Enables building of the SLIP driver. SLIP requires