sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changes for clean build with Ethernet+SLIP

Browse Source
This commit is contained in:
Gregory Nutt 2014-11-16 11:27:53 -06:00
parent 38754a3466
commit 57bcb28991
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/stm32f4discovery/netnsh/defconfig
View File

@ -730,8 +730,12 @@ CONFIG_ARCH_HAVE_NET=y
CONFIG_ARCH_HAVE_PHY=y CONFIG_ARCH_HAVE_PHY=y
CONFIG_NET=y CONFIG_NET=y
# CONFIG_NET_NOINTS is not set # CONFIG_NET_NOINTS is not set
CONFIG_NET_MULTIBUFFER=y
# CONFIG_NET_PROMISCUOUS is not set # CONFIG_NET_PROMISCUOUS is not set
#
# Driver buffer configuration
#
CONFIG_NET_MULTIBUFFER=y
CONFIG_NET_ETH_MTU=590 CONFIG_NET_ETH_MTU=590
CONFIG_NET_ETH_TCP_RECVWNDO=536 CONFIG_NET_ETH_TCP_RECVWNDO=536
CONFIG_NET_GUARDSIZE=2 CONFIG_NET_GUARDSIZE=2

6
net/Kconfig
View File

@ -69,7 +69,7 @@ config NET_ETH_MTU
resulting in a minimum buffer size of of 1220+20+40+14 = 1294 resulting in a minimum buffer size of of 1220+20+40+14 = 1294
config NET_ETH_TCP_RECVWNDO config NET_ETH_TCP_RECVWNDO
int "Ethernet receive window size" int "Ethernet TCP receive window size"
default 1220 if NET_IPv6 default 1220 if NET_IPv6
default 536 if !NET_IPv6 default 536 if !NET_IPv6
depends on NET_ETHERNET && NET_TCP depends on NET_ETHERNET && NET_TCP
@ -93,7 +93,7 @@ config NET_SLIP_MTU
recommended. recommended.
config NET_SLIP_TCP_RECVWNDO config NET_SLIP_TCP_RECVWNDO
int "SLIP receive window size" int "SLIP TCP receive window size"
default 256 default 256
depends on NET_SLIP && NET_TCP depends on NET_SLIP && NET_TCP
---help--- ---help---
@ -113,7 +113,7 @@ config NET_GUARDSIZE
packet size will be chopped down to the size indicated in the TCP packet size will be chopped down to the size indicated in the TCP
header. header.
end menu # Driver buffer configuration endmenu # Driver buffer configuration
menu "Data link support" menu "Data link support"

6
net/netdev/netdev_register.c
View File

@ -136,7 +136,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
dev->d_llhdrlen = ETH_HDRLEN; dev->d_llhdrlen = ETH_HDRLEN;
dev->d_mtu = CONFIG_NET_ETH_MTU; dev->d_mtu = CONFIG_NET_ETH_MTU;
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
dev->d_recvwndo = CONFIG_NET_ETH_RECVWNDO; dev->d_recvwndo = CONFIG_NET_ETH_TCP_RECVWNDO;
#endif #endif
devfmt = NETDEV_ETH_FORMAT; devfmt = NETDEV_ETH_FORMAT;
break; break;
@ -147,7 +147,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
dev->d_llhdrlen = 0; dev->d_llhdrlen = 0;
dev->d_mtu = CONFIG_NET_SLIP_MTU; dev->d_mtu = CONFIG_NET_SLIP_MTU;
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
dev->d_recvwndo = CONFIG_NET_SLIP_RECVWNDO; dev->d_recvwndo = CONFIG_NET_SLIP_TCP_RECVWNDO;
#endif #endif
devfmt = NETDEV_SLIP_FORMAT; devfmt = NETDEV_SLIP_FORMAT;
break; break;
@ -158,7 +158,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
dev->d_llhdrlen = 0; dev->d_llhdrlen = 0;
dev->d_mtu = CONFIG_NET_PPP_MTU; dev->d_mtu = CONFIG_NET_PPP_MTU;
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
dev->d_recvwndo = CONFIG_NET_PPP_RECVWNDO; dev->d_recvwndo = CONFIG_NET_PPP_TCP_RECVWNDO;
#endif #endif
devfmt = NETDEV_PPP_FORMAT; devfmt = NETDEV_PPP_FORMAT;
break; break;