Skip to content

Commit

Permalink
samples: net: Fix sanitycheck for sam_e70_xplained board
Browse files Browse the repository at this point in the history 
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 <jukka.rissanen@linux.intel.com>
  • Loading branch information
@jukkar
jukkar authored and Anas Nashif committed Apr 5, 2018
1 parent 3e54d39 commit a0df4f6
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 30 deletions.
5 changes: 0 additions & 5 deletions samples/net/dhcpv4_client/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions samples/net/dns_resolve/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions samples/net/nats/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions samples/net/syslog_net/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions samples/net/telnet/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion subsys/net/ip/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,27 +347,31 @@ 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)

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.

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.
Expand Down
4 changes: 0 additions & 4 deletions tests/net/lib/mqtt_publisher/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions tests/net/lib/mqtt_subscriber/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a0df4f6

Please sign in to comment.