From c0239b41c92c7efdf216069880d66cd3e664abbc Mon Sep 17 00:00:00 2001 From: Robert Olsson Date: Sun, 19 Mar 2017 21:14:31 +0100 Subject: [PATCH] Cleand-up _CONF for ROUTES, NEIGHBOR and BUFFER_SIZE modified: platform/avr-rss2/contiki-conf.h --- platform/avr-rss2/contiki-conf.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/platform/avr-rss2/contiki-conf.h b/platform/avr-rss2/contiki-conf.h index 8b365671a..b379319b6 100644 --- a/platform/avr-rss2/contiki-conf.h +++ b/platform/avr-rss2/contiki-conf.h @@ -165,6 +165,16 @@ typedef unsigned short uip_stats_t; #define RDC_CONF_MCU_SLEEP 1 #if NETSTACK_CONF_WITH_IPV6 + +#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS +#define NBR_TABLE_CONF_MAX_NEIGHBORS 20 +#endif +#ifndef UIP_CONF_MAX_ROUTES +#define UIP_CONF_MAX_ROUTES 20 +#endif +#ifndef UIP_CONF_BUFFER_SIZE +#define UIP_CONF_BUFFER_SIZE 1280 +#endif #define LINKADDR_CONF_SIZE 8 #define UIP_CONF_ICMP6 1 #define UIP_CONF_UDP 1 @@ -230,16 +240,15 @@ typedef unsigned short uip_stats_t; /* from previous GETs, causing decreased throughput, retransmissions, and timeouts. Increase to study this. */ /* ACKs to other ports become interleaved with computation-intensive GETs, so ACKs are particularly missed. */ /* Increasing the number of packet receive buffers in RAM helps to keep ACKs from being lost */ + #define UIP_CONF_MAX_CONNECTIONS 4 /* 2 bytes per TCP listening port */ #define UIP_CONF_MAX_LISTENPORTS 4 /* 25 bytes per UDP connection */ #define UIP_CONF_UDP_CONNS 10 /* See uip-ds6.h */ -#define NBR_TABLE_CONF_MAX_NEIGHBORS 20 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 -#define UIP_CONF_MAX_ROUTES 20 #define UIP_CONF_DS6_ADDR_NBU 3 #define UIP_CONF_DS6_MADDR_NBU 0 #define UIP_CONF_DS6_AADDR_NBU 0 @@ -271,10 +280,8 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_UDP_CONNS 5 -#define NBR_TABLE_CONF_MAX_NEIGHBORS 20 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 -#define UIP_CONF_MAX_ROUTES 20 #define UIP_CONF_DS6_ADDR_NBU 3 #define UIP_CONF_DS6_MADDR_NBU 0 #define UIP_CONF_DS6_AADDR_NBU 0 @@ -300,10 +307,8 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_UDP_CONNS 5 -#define NBR_TABLE_CONF_MAX_NEIGHBORS 4 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 -#define UIP_CONF_MAX_ROUTES 4 #define UIP_CONF_DS6_ADDR_NBU 3 #define UIP_CONF_DS6_MADDR_NBU 0 #define UIP_CONF_DS6_AADDR_NBU 0 @@ -333,7 +338,6 @@ typedef unsigned short uip_stats_t; /* For slow slip connections, to prevent buffer overruns */ /* #define UIP_CONF_RECEIVE_WINDOW 300 */ #undef UIP_CONF_FWCACHE_SIZE -#define UIP_CONF_BUFFER_SIZE 600 /* DHCPv4 packets by ip64 module */ #define UIP_CONF_FWCACHE_SIZE 30 #define UIP_CONF_BROADCAST 1 #define UIP_ARCH_IPCHKSUM 1