From a0df4f66984b3cc52c07da52e74fdadf7c79b728 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Thu, 29 Mar 2018 14:33:49 +0300 Subject: [PATCH] samples: net: Fix sanitycheck for sam_e70_xplained board Some of the sanitycheck tests were having too small limit for network buffers when compiling for sam_e70_xplained board. Increase the buffer limits when testing this for this board. Signed-off-by: Jukka Rissanen --- samples/net/dhcpv4_client/prj.conf | 5 ----- samples/net/dns_resolve/prj.conf | 4 ---- samples/net/nats/prj.conf | 2 -- samples/net/syslog_net/prj.conf | 4 ---- samples/net/telnet/prj.conf | 5 ----- subsys/net/ip/Kconfig | 6 +++++- tests/net/lib/mqtt_publisher/prj.conf | 4 ---- tests/net/lib/mqtt_subscriber/prj.conf | 5 ----- 8 files changed, 5 insertions(+), 30 deletions(-) diff --git a/samples/net/dhcpv4_client/prj.conf b/samples/net/dhcpv4_client/prj.conf index c26959b2298..dec52fad079 100644 --- a/samples/net/dhcpv4_client/prj.conf +++ b/samples/net/dhcpv4_client/prj.conf @@ -5,11 +5,6 @@ CONFIG_NET_ARP=y CONFIG_NET_UDP=y CONFIG_NET_DHCPV4=y -CONFIG_NET_PKT_RX_COUNT=4 -CONFIG_NET_PKT_TX_COUNT=4 -CONFIG_NET_BUF_RX_COUNT=16 -CONFIG_NET_BUF_TX_COUNT=16 - CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_INIT_STACKS=y diff --git a/samples/net/dns_resolve/prj.conf b/samples/net/dns_resolve/prj.conf index bd76f6dfc84..37c1ac53c69 100644 --- a/samples/net/dns_resolve/prj.conf +++ b/samples/net/dns_resolve/prj.conf @@ -3,10 +3,6 @@ CONFIG_NET_UDP=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_INIT_STACKS=y -CONFIG_NET_PKT_RX_COUNT=10 -CONFIG_NET_PKT_TX_COUNT=10 -CONFIG_NET_BUF_RX_COUNT=10 -CONFIG_NET_BUF_TX_COUNT=10 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5 diff --git a/samples/net/nats/prj.conf b/samples/net/nats/prj.conf index 71134bf70f9..613ebcd2ad1 100644 --- a/samples/net/nats/prj.conf +++ b/samples/net/nats/prj.conf @@ -8,8 +8,6 @@ CONFIG_NET_IPV6=y CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_LOG=y CONFIG_NET_MAX_CONTEXTS=10 -CONFIG_NET_PKT_RX_COUNT=14 -CONFIG_NET_PKT_TX_COUNT=14 CONFIG_NET_SHELL=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y diff --git a/samples/net/syslog_net/prj.conf b/samples/net/syslog_net/prj.conf index deaf1c24951..cb6e61815b2 100644 --- a/samples/net/syslog_net/prj.conf +++ b/samples/net/syslog_net/prj.conf @@ -3,10 +3,6 @@ CONFIG_NET_UDP=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_INIT_STACKS=y -CONFIG_NET_PKT_RX_COUNT=10 -CONFIG_NET_PKT_TX_COUNT=10 -CONFIG_NET_BUF_RX_COUNT=10 -CONFIG_NET_BUF_TX_COUNT=10 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5 diff --git a/samples/net/telnet/prj.conf b/samples/net/telnet/prj.conf index d8887f9cfe0..f94a3c02ee5 100644 --- a/samples/net/telnet/prj.conf +++ b/samples/net/telnet/prj.conf @@ -15,11 +15,6 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2 CONFIG_NET_MAX_CONTEXTS=10 -CONFIG_NET_PKT_RX_COUNT=10 -CONFIG_NET_PKT_TX_COUNT=10 -CONFIG_NET_BUF_RX_COUNT=20 -CONFIG_NET_BUF_TX_COUNT=20 - CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_INIT_STACKS=y diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig index 2156e54814b..d15642de1d9 100644 --- a/subsys/net/ip/Kconfig +++ b/subsys/net/ip/Kconfig @@ -347,13 +347,15 @@ endif # NET_RAW_MODE config NET_PKT_RX_COUNT int "How many packet receives can be pending at the same time" default 4 + default 14 if NET_L2_ETHERNET help Each RX buffer will occupy smallish amount of memory. See include/net/net_pkt.h and the sizeof(struct net_pkt) config NET_PKT_TX_COUNT int "How many packet sends can be pending at the same time" - default 2 + default 4 + default 14 if NET_L2_ETHERNET help Each TX buffer will occupy smallish amount of memory. See include/net/net_pkt.h and the sizeof(struct net_pkt) @@ -361,6 +363,7 @@ config NET_PKT_TX_COUNT config NET_BUF_RX_COUNT int "How many network buffers are allocated for receiving data" default 16 + default 36 if NET_L2_ETHERNET help Each data buffer will occupy CONFIG_NET_BUF_DATA_SIZE + smallish header (sizeof(struct net_buf)) amount of data. @@ -368,6 +371,7 @@ config NET_BUF_RX_COUNT config NET_BUF_TX_COUNT int "How many network buffers are allocated for sending data" default 16 + default 36 if NET_L2_ETHERNET help Each data buffer will occupy CONFIG_NET_BUF_DATA_SIZE + smallish header (sizeof(struct net_buf)) amount of data. diff --git a/tests/net/lib/mqtt_publisher/prj.conf b/tests/net/lib/mqtt_publisher/prj.conf index d73e9cde464..1b47f1f2b73 100644 --- a/tests/net/lib/mqtt_publisher/prj.conf +++ b/tests/net/lib/mqtt_publisher/prj.conf @@ -4,10 +4,6 @@ CONFIG_ENTROPY_GENERATOR=y CONFIG_NET_LOG=y CONFIG_INIT_STACKS=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NET_NBUF_RX_COUNT=16 -CONFIG_NET_NBUF_TX_COUNT=16 -CONFIG_NET_NBUF_RX_DATA_COUNT=16 -CONFIG_NET_NBUF_TX_DATA_COUNT=16 CONFIG_NET_IPV6_RA_RDNSS=y CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 diff --git a/tests/net/lib/mqtt_subscriber/prj.conf b/tests/net/lib/mqtt_subscriber/prj.conf index fb4a61e083c..b4547101dfd 100644 --- a/tests/net/lib/mqtt_subscriber/prj.conf +++ b/tests/net/lib/mqtt_subscriber/prj.conf @@ -5,11 +5,6 @@ CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y CONFIG_INIT_STACKS=y -CONFIG_NET_NBUF_RX_COUNT=16 -CONFIG_NET_NBUF_TX_COUNT=16 -CONFIG_NET_NBUF_RX_DATA_COUNT=16 -CONFIG_NET_NBUF_TX_DATA_COUNT=16 - CONFIG_NET_IPV6_RA_RDNSS=y CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2