Remove duplicated NET_SLIP option from drivers/net/Kconfig

This commit is contained in:
Xiang Xiao
2020-02-02 14:20:43 +08:00
committed by Gregory Nutt
parent 57099fe441
commit 2d7c072723
6 changed files with 12 additions and 40 deletions
+2 -2
View File
@@ -15767,7 +15767,7 @@
Other TCP-specific issues also fixed. There remains a major Other TCP-specific issues also fixed. There remains a major
outstanding issue with ACK handling. Handle case where the local outstanding issue with ACK handling. Handle case where the local
address is zero (listen socket). Major re-architecting of TCP logic 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; not properly covered in the initial design. Still does not work;
hangs waiting of ACKs.Various fixes for a clean build if either TCP 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 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 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 capability of FTL which will let you use an MTD interface directly as a
block device. From Jussi Kivilinna (2017-10-19). 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 net_clone(). net_clone() which is the common logic underlying dup() and
dup2() for sockets. When net_clone() calls net_start_monitor() and dup2() for sockets. When net_clone() calls net_start_monitor() and
net_start_monitor() returns a failure (because the underlying TCP net_start_monitor() returns a failure (because the underlying TCP
+2 -2
View File
@@ -16312,7 +16312,7 @@ detailed bugfix information):
- sockgetname() files need to include udp/udp.h and tcp/tcp.h or - 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 otherwise NET_UDP_HAVE_STACK and NET_TCP_HAVE_STACK are undefined
and the logic is never compiled. Noted by Anthony Merlino. 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 logic of net_clone(). net_clone() which is the common logic
underlying dup() and dup2() for sockets. When net_clone() calls underlying dup() and dup2() for sockets. When net_clone() calls
net_start_monitor() and net_start_monitor() returns a failure 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 multicast address. Exiting logic only supported UDP multicast. But
MLD and certain other ICMPv6 packets also require acceptance of MLD and certain other ICMPv6 packets also require acceptance of
multicast packets. From Gregory Nutt. 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 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 IOB chain qentry available. Otherwise, we will advertise that we an
buffer a lot of data when, in fact, we cannot. This is an buffer a lot of data when, in fact, we cannot. This is an
-33
View File
@@ -94,10 +94,6 @@ config TELNET_DUMPBUFFER
endif # NETDEV_TELNET endif # NETDEV_TELNET
config ARCH_HAVE_NETDEV_STATISTICS
bool
default n
config NETDEV_STATISTICS config NETDEV_STATISTICS
bool "Network device driver statistics" bool "Network device driver statistics"
depends on NET_STATISTICS && ARCH_HAVE_NETDEV_STATISTICS depends on NET_STATISTICS && ARCH_HAVE_NETDEV_STATISTICS
@@ -307,35 +303,6 @@ config ENCX24J600_REGDEBUG
endif # ENCX24J600 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 menuconfig NET_FTMAC100
bool "Faraday 10/100 Ethernet" bool "Faraday 10/100 Ethernet"
default n default n
+1 -1
View File
@@ -87,7 +87,7 @@
#endif #endif
/* The Linux slip module hard-codes its MTU size to 296 (40 bytes for the /* 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. * CONFIG_NET_SLIP_PKTSIZE to 296 as well.
* *
* There may be an issue with this setting, however. I see that Linux uses * There may be an issue with this setting, however. I see that Linux uses
+1 -1
View File
@@ -62,7 +62,7 @@
* Default 296 * Default 296
* *
* The Linux slip module hard-codes its MTU size to 296 (40 bytes for the * 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. * CONFIG_NET_SLIP_PKTSIZE to 296 as well.
* *
* There may be an issue with this setting, however. I see that Linux * There may be an issue with this setting, however. I see that Linux
+6 -1
View File
@@ -11,6 +11,10 @@ config ARCH_HAVE_PHY
bool bool
default n default n
config ARCH_HAVE_NETDEV_STATISTICS
bool
default n
config NET_WRITE_BUFFERS config NET_WRITE_BUFFERS
bool bool
default n default n
@@ -84,7 +88,7 @@ config NET_SLIP_PKTSIZE
296 are not recommended. 296 are not recommended.
The Linux slip module hard-codes its MTU size to 296 (40 bytes for 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. set CONFIG_NET_SLIP_PKTSIZE to 296 as well.
There may be an issue with this setting, however. I see that Linux There may be an issue with this setting, however. I see that Linux
@@ -125,6 +129,7 @@ config NET_LOOPBACK
menuconfig NET_SLIP menuconfig NET_SLIP
bool "SLIP support" bool "SLIP support"
select ARCH_HAVE_NETDEV_STATISTICS
default n default n
---help--- ---help---
Enables building of the SLIP driver. SLIP requires Enables building of the SLIP driver. SLIP requires