changes for clean build with Ethernet+SLIP

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

View File

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

View File

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

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_mtu = CONFIG_NET_ETH_MTU;
#ifdef CONFIG_NET_TCP
dev->d_recvwndo = CONFIG_NET_ETH_RECVWNDO;
dev->d_recvwndo = CONFIG_NET_ETH_TCP_RECVWNDO;
#endif
devfmt = NETDEV_ETH_FORMAT;
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_mtu = CONFIG_NET_SLIP_MTU;
#ifdef CONFIG_NET_TCP
dev->d_recvwndo = CONFIG_NET_SLIP_RECVWNDO;
dev->d_recvwndo = CONFIG_NET_SLIP_TCP_RECVWNDO;
#endif
devfmt = NETDEV_SLIP_FORMAT;
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_mtu = CONFIG_NET_PPP_MTU;
#ifdef CONFIG_NET_TCP
dev->d_recvwndo = CONFIG_NET_PPP_RECVWNDO;
dev->d_recvwndo = CONFIG_NET_PPP_TCP_RECVWNDO;
#endif
devfmt = NETDEV_PPP_FORMAT;
break;