diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-01-16 16:37:23 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-01-16 16:37:23 -0600 |
| commit | 5d3165161596265372177859b50577ae1ee54be0 (patch) | |
| tree | b5d756509727c46ce6f2ef02cd291223db51ac91 | |
| parent | 2403823880976fc3fc2385d4621d2a5e09b442fa (diff) | |
| download | nuttx-5d3165161596265372177859b50577ae1ee54be0.tar.gz nuttx-5d3165161596265372177859b50577ae1ee54be0.tar.bz2 nuttx-5d3165161596265372177859b50577ae1ee54be0.zip | |
Some fixes for typos in recent changes to Kconfig files
| -rw-r--r-- | nuttx/configs/Kconfig | 1 | ||||
| -rw-r--r-- | nuttx/configs/viewtool-stm32f107/netnsh/defconfig | 12 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uipopt.h | 6 | ||||
| -rw-r--r-- | nuttx/net/Kconfig | 3 |
4 files changed, 18 insertions, 4 deletions
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig index c4565dbe7..b5869e209 100644 --- a/nuttx/configs/Kconfig +++ b/nuttx/configs/Kconfig @@ -870,6 +870,7 @@ config ARCH_BOARD_CUSTOM_DIR "~/projects/myboard"). config ARCH_BOARD + string default "amber" if ARCH_BOARD_AMBER default "arduino-due" if ARCH_BOARD_ARDUINO_DUE default "avr32dev1" if ARCH_BOARD_AVR32DEV1 diff --git a/nuttx/configs/viewtool-stm32f107/netnsh/defconfig b/nuttx/configs/viewtool-stm32f107/netnsh/defconfig index a6675ebb0..a0a9dd200 100644 --- a/nuttx/configs/viewtool-stm32f107/netnsh/defconfig +++ b/nuttx/configs/viewtool-stm32f107/netnsh/defconfig @@ -551,8 +551,9 @@ CONFIG_NET_TCP=y CONFIG_NET_TCP_CONNS=40 CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_TCP_READAHEAD=y -CONFIG_NET_TCP_READAHEAD_BUFSIZE=650 +CONFIG_NET_TCP_READAHEAD_BUFSIZE=596 CONFIG_NET_NTCP_READAHEAD_BUFFERS=8 +# CONFIG_NET_TCP_WRITE_BUFFERS is not set CONFIG_NET_TCP_RECVDELAY=0 # CONFIG_NET_TCPBACKLOG is not set # CONFIG_NET_TCP_SPLIT is not set @@ -571,7 +572,7 @@ CONFIG_NET_ICMP_PING=y # CONFIG_NET_PINGADDRCONF is not set # CONFIG_NET_IGMP is not set # CONFIG_NET_STATISTICS is not set -CONFIG_NET_RECEIVE_WINDOW=650 +CONFIG_NET_RECEIVE_WINDOW=596 CONFIG_NET_ARPTAB_SIZE=16 # CONFIG_NET_ARP_IPIN is not set # CONFIG_NET_ROUTE is not set @@ -886,7 +887,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20 # CONFIG_PLATFORM_CONFIGDATA is not set # -# System NSH Add-Ons +# System Libraries and NSH Add-Ons # # @@ -907,6 +908,11 @@ CONFIG_NSH_MAX_ROUNDTRIP=20 # # +# INI File Parser +# +# CONFIG_SYSTEM_INIFILE is not set + +# # FLASH Program Installation # # CONFIG_SYSTEM_INSTALL is not set diff --git a/nuttx/include/nuttx/net/uip/uipopt.h b/nuttx/include/nuttx/net/uip/uipopt.h index 457a2f855..5059d7e1b 100644 --- a/nuttx/include/nuttx/net/uip/uipopt.h +++ b/nuttx/include/nuttx/net/uip/uipopt.h @@ -318,6 +318,12 @@ # define CONFIG_NET_TCP_WRITE_BUFSIZE UIP_TCP_MSS # endif + /* The size of the write buffer should not exceed the maximum TCP MSS */ + +# if CONFIG_NET_TCP_WRITE_BUFSIZE > UIP_TCP_MSS +# error CONFIG_NET_TCP_WRITE_BUFSIZE must not exceed UIP_TCP_MSS +# endif + #else # undef CONFIG_NET_TCP_WRITE_BUFSIZE # undef CONFIG_NET_NTCP_WRITE_BUFFERS diff --git a/nuttx/net/Kconfig b/nuttx/net/Kconfig index 1bf791413..ead407e5e 100644 --- a/nuttx/net/Kconfig +++ b/nuttx/net/Kconfig @@ -50,6 +50,7 @@ config NET_PROMISCUOUS config NET_IPv6 bool "IPv6" default n + depends on EXPERIMENTAL ---help--- Build in support for IPv6. Not fully implemented. @@ -83,7 +84,7 @@ config NET_SOLINGER endif # NET_SOCKOPTS config NET_BUFSIZE - int "Network packet size" + int "Network packet buffer size" default 1294 if !NET_SLIP && NET_IPv6 default 590 if !NET_SLIP && !NET_IPv6 default 296 if NET_SLIP && !NET_IPv6 |