Adjust PBUF_POOL_SIZE to the minimal size to run CHIP stack (#6018)

* [QPG6100] Adjust PBUF_POOL_SIZE to the minimal size to allow CHIP stack work * Remove unused PBUF config flags * Change the PBUF size to fit within minimal IPv6 MTU
project-chip · Apr 19, 2021 · 994e13c · 994e13c
1 parent 88780da
commit 994e13c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 38 deletions.
diff --git a/src/lwip/cc13x2_26x2/lwipopts.h b/src/lwip/cc13x2_26x2/lwipopts.h
@@ -89,14 +89,8 @@
 #define MEMP_SEPARATE_POOLS (1)
 #define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
 #define MEMP_USE_CUSTOM_POOLS (0)
-#define PBUF_POOL_SIZE (4)
-#define PBUF_POOL_BUFSIZE (1500)
-#define PBUF_POOL_SIZE_LARGE (1)
-#define PBUF_POOL_SIZE_MEDIUM (2)
-#define PBUF_POOL_SIZE_SMALL (2)
-#define PBUF_POOL_BUFSIZE_LARGE (1280)
-#define PBUF_POOL_BUFSIZE_MEDIUM (640)
-#define PBUF_POOL_BUFSIZE_SMALL (256)
+#define PBUF_POOL_SIZE (6)
+#define PBUF_POOL_BUFSIZE (1280)
 #define PBUF_CUSTOM_POOL_IDX_START (MEMP_PBUF_POOL_SMALL)
 #define PBUF_CUSTOM_POOL_IDX_END (MEMP_PBUF_POOL_LARGE)
 

diff --git a/src/lwip/efr32/lwipopts.h b/src/lwip/efr32/lwipopts.h
@@ -98,28 +98,16 @@
 #define MEMP_SEPARATE_POOLS (1)
 #define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
 #define MEMP_USE_CUSTOM_POOLS (0)
-#define PBUF_POOL_SIZE (4)
-#define PBUF_POOL_BUFSIZE (1500)
-#define PBUF_POOL_SIZE_LARGE (1)
-#define PBUF_POOL_SIZE_MEDIUM (2)
-#define PBUF_POOL_SIZE_SMALL (2)
-#define PBUF_POOL_BUFSIZE_LARGE (1280)
-#define PBUF_POOL_BUFSIZE_MEDIUM (640)
-#define PBUF_POOL_BUFSIZE_SMALL (256)
+#define PBUF_POOL_SIZE (6)
+#define PBUF_POOL_BUFSIZE (1280)
 #define PBUF_CUSTOM_POOL_IDX_START (MEMP_PBUF_POOL_SMALL)
 #define PBUF_CUSTOM_POOL_IDX_END (MEMP_PBUF_POOL_LARGE)
 #else
 #define MEMP_SEPARATE_POOLS (1)
 #define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
 #define MEMP_USE_CUSTOM_POOLS (0)
 #define PBUF_POOL_SIZE (8)
-#define PBUF_POOL_BUFSIZE (1500)
-#define PBUF_POOL_SIZE_LARGE (3)
-#define PBUF_POOL_SIZE_MEDIUM (4)
-#define PBUF_POOL_SIZE_SMALL (5)
-#define PBUF_POOL_BUFSIZE_LARGE (1280)
-#define PBUF_POOL_BUFSIZE_MEDIUM (640)
-#define PBUF_POOL_BUFSIZE_SMALL (256)
+#define PBUF_POOL_BUFSIZE (1280)
 #define PBUF_CUSTOM_POOL_IDX_START (MEMP_PBUF_POOL_SMALL)
 #define PBUF_CUSTOM_POOL_IDX_END (MEMP_PBUF_POOL_LARGE)
 #endif

diff --git a/src/lwip/k32w/lwipopts.h b/src/lwip/k32w/lwipopts.h
@@ -95,13 +95,7 @@
 #define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
 #define MEMP_USE_CUSTOM_POOLS (0)
 #define PBUF_POOL_SIZE (8)
-#define PBUF_POOL_BUFSIZE (1500)
-#define PBUF_POOL_SIZE_LARGE (3)
-#define PBUF_POOL_SIZE_MEDIUM (4)
-#define PBUF_POOL_SIZE_SMALL (5)
-#define PBUF_POOL_BUFSIZE_LARGE (1280)
-#define PBUF_POOL_BUFSIZE_MEDIUM (640)
-#define PBUF_POOL_BUFSIZE_SMALL (256)
+#define PBUF_POOL_BUFSIZE (1280)
 #define PBUF_CUSTOM_POOL_IDX_START (MEMP_PBUF_POOL_SMALL)
 #define PBUF_CUSTOM_POOL_IDX_END (MEMP_PBUF_POOL_LARGE)
 

diff --git a/src/lwip/qpg6100/lwipopts.h b/src/lwip/qpg6100/lwipopts.h
@@ -89,14 +89,8 @@
 #define MEMP_SEPARATE_POOLS (1)
 #define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
 #define MEMP_USE_CUSTOM_POOLS (0)
-#define PBUF_POOL_SIZE (4)
-#define PBUF_POOL_BUFSIZE (1500)
-#define PBUF_POOL_SIZE_LARGE (1)
-#define PBUF_POOL_SIZE_MEDIUM (2)
-#define PBUF_POOL_SIZE_SMALL (2)
-#define PBUF_POOL_BUFSIZE_LARGE (1280)
-#define PBUF_POOL_BUFSIZE_MEDIUM (640)
-#define PBUF_POOL_BUFSIZE_SMALL (256)
+#define PBUF_POOL_SIZE (6)
+#define PBUF_POOL_BUFSIZE (1280)
 #define PBUF_CUSTOM_POOL_IDX_START (MEMP_PBUF_POOL_SMALL)
 #define PBUF_CUSTOM_POOL_IDX_END (MEMP_PBUF_POOL_LARGE)