TCP Read-Ahead: Convert to use I/O buffer chains

6 files changed, 30 insertions, 12 deletions

diff --git a/nuttx/configs/rgmp/arm/default/defconfig b/nuttx/configs/rgmp/arm/default/defconfig
index a0b63bc04..ba309aff3 100644
--- a/nuttx/configs/rgmp/arm/default/defconfig
+++ b/nuttx/configs/rgmp/arm/default/defconfig
@@ -312,8 +312,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_TCP_READAHEAD=y
-CONFIG_NET_TCP_READAHEAD_BUFSIZE=1460
-CONFIG_NET_NTCP_READAHEAD_BUFFERS=8
 # CONFIG_NET_TCP_WRITE_BUFFERS is not set
 CONFIG_NET_TCP_RECVDELAY=0
 # CONFIG_NET_TCPBACKLOG is not set
@@ -336,6 +334,11 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_RECEIVE_WINDOW=1460
 CONFIG_NET_ARPTAB_SIZE=16
 # CONFIG_NET_ARP_IPIN is not set
+CONFIG_NET_IOB=y
+CONFIG_IOB_NBUFFERS=24
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=0
 # CONFIG_NET_ROUTE is not set
 
 #
diff --git a/nuttx/configs/rgmp/arm/nsh/defconfig b/nuttx/configs/rgmp/arm/nsh/defconfig
index cc5c92aa4..dea6ce875 100644
--- a/nuttx/configs/rgmp/arm/nsh/defconfig
+++ b/nuttx/configs/rgmp/arm/nsh/defconfig
@@ -334,8 +334,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_TCP_READAHEAD=y
-CONFIG_NET_TCP_READAHEAD_BUFSIZE=1460
-CONFIG_NET_NTCP_READAHEAD_BUFFERS=8
 # CONFIG_NET_TCP_WRITE_BUFFERS is not set
 CONFIG_NET_TCP_RECVDELAY=0
 # CONFIG_NET_TCPBACKLOG is not set
@@ -358,6 +356,11 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_RECEIVE_WINDOW=1460
 CONFIG_NET_ARPTAB_SIZE=8
 # CONFIG_NET_ARP_IPIN is not set
+CONFIG_NET_IOB=y
+CONFIG_IOB_NBUFFERS=24
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=0
 # CONFIG_NET_ROUTE is not set
 
 #
diff --git a/nuttx/configs/rgmp/x86/cxxtest/defconfig b/nuttx/configs/rgmp/x86/cxxtest/defconfig
index ed7ce4dd1..7fcc74b28 100644
--- a/nuttx/configs/rgmp/x86/cxxtest/defconfig
+++ b/nuttx/configs/rgmp/x86/cxxtest/defconfig
@@ -341,8 +341,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_TCP_READAHEAD=y
-CONFIG_NET_TCP_READAHEAD_BUFSIZE=1460
-CONFIG_NET_NTCP_READAHEAD_BUFFERS=8
 # CONFIG_NET_TCP_WRITE_BUFFERS is not set
 CONFIG_NET_TCP_RECVDELAY=0
 # CONFIG_NET_TCPBACKLOG is not set
@@ -365,6 +363,11 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_RECEIVE_WINDOW=1460
 CONFIG_NET_ARPTAB_SIZE=16
 # CONFIG_NET_ARP_IPIN is not set
+CONFIG_NET_IOB=y
+CONFIG_IOB_NBUFFERS=24
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=0
 # CONFIG_NET_ROUTE is not set
 
 #
diff --git a/nuttx/configs/rgmp/x86/default/defconfig b/nuttx/configs/rgmp/x86/default/defconfig
index d882b8cf6..9ea922f01 100644
--- a/nuttx/configs/rgmp/x86/default/defconfig
+++ b/nuttx/configs/rgmp/x86/default/defconfig
@@ -320,8 +320,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_TCP_READAHEAD=y
-CONFIG_NET_TCP_READAHEAD_BUFSIZE=1460
-CONFIG_NET_NTCP_READAHEAD_BUFFERS=8
 # CONFIG_NET_TCP_WRITE_BUFFERS is not set
 CONFIG_NET_TCP_RECVDELAY=0
 # CONFIG_NET_TCPBACKLOG is not set
@@ -344,6 +342,11 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_RECEIVE_WINDOW=1460
 CONFIG_NET_ARPTAB_SIZE=16
 # CONFIG_NET_ARP_IPIN is not set
+CONFIG_NET_IOB=y
+CONFIG_IOB_NBUFFERS=24
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=0
 # CONFIG_NET_ROUTE is not set
 
 #
diff --git a/nuttx/configs/rgmp/x86/helloxx/defconfig b/nuttx/configs/rgmp/x86/helloxx/defconfig
index 616cfbcba..312b31839 100644
--- a/nuttx/configs/rgmp/x86/helloxx/defconfig
+++ b/nuttx/configs/rgmp/x86/helloxx/defconfig
@@ -341,8 +341,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_TCP_READAHEAD=y
-CONFIG_NET_TCP_READAHEAD_BUFSIZE=1460
-CONFIG_NET_NTCP_READAHEAD_BUFFERS=8
 # CONFIG_NET_TCP_WRITE_BUFFERS is not set
 CONFIG_NET_TCP_RECVDELAY=0
 # CONFIG_NET_TCPBACKLOG is not set
@@ -365,6 +363,11 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_RECEIVE_WINDOW=1460
 CONFIG_NET_ARPTAB_SIZE=16
 # CONFIG_NET_ARP_IPIN is not set
+CONFIG_NET_IOB=y
+CONFIG_IOB_NBUFFERS=24
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=0
 # CONFIG_NET_ROUTE is not set
 
 #
diff --git a/nuttx/configs/rgmp/x86/nsh/defconfig b/nuttx/configs/rgmp/x86/nsh/defconfig
index 429bb9a48..a455b18ec 100644
--- a/nuttx/configs/rgmp/x86/nsh/defconfig
+++ b/nuttx/configs/rgmp/x86/nsh/defconfig
@@ -342,8 +342,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_TCP_READAHEAD=y
-CONFIG_NET_TCP_READAHEAD_BUFSIZE=1460
-CONFIG_NET_NTCP_READAHEAD_BUFFERS=8
 # CONFIG_NET_TCP_WRITE_BUFFERS is not set
 CONFIG_NET_TCP_RECVDELAY=0
 # CONFIG_NET_TCPBACKLOG is not set
@@ -366,6 +364,11 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_RECEIVE_WINDOW=1460
 CONFIG_NET_ARPTAB_SIZE=8
 # CONFIG_NET_ARP_IPIN is not set
+CONFIG_NET_IOB=y
+CONFIG_IOB_NBUFFERS=24
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=0
 # CONFIG_NET_ROUTE is not set
 
 #