From c8eff983456c8a9aceb12654504dffacde4a3409 Mon Sep 17 00:00:00 2001 From: wu-changsheng Date: Wed, 21 Dec 2022 22:53:09 +0800 Subject: [PATCH] reduce struct pbuf size (cherry picked from commit 314e4a3cfca2ca94bdbd93e96c54eb9e694c5df1) --- 0047-reduce-struct-pbuf-size.patch | 25 +++++++++++++++++++++++++ lwip.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0047-reduce-struct-pbuf-size.patch diff --git a/0047-reduce-struct-pbuf-size.patch b/0047-reduce-struct-pbuf-size.patch new file mode 100644 index 0000000..fed1ba5 --- /dev/null +++ b/0047-reduce-struct-pbuf-size.patch @@ -0,0 +1,25 @@ +From 5527e02b7ae7f27db8964ad55747326b98e33634 Mon Sep 17 00:00:00 2001 +From: wu-changsheng +Date: Wed, 21 Dec 2022 22:47:04 +0800 +Subject: [PATCH] reduce struct pbuf size + +--- + src/include/lwip/pbuf.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h +index 380ac8e..1124408 100644 +--- a/src/include/lwip/pbuf.h ++++ b/src/include/lwip/pbuf.h +@@ -229,7 +229,7 @@ struct pbuf { + u64_t l3_len:9; + /* < L4 (TCP/UDP) Header Length. */ + u64_t l4_len:8; +- u16_t header_off; ++ u8_t header_off; + u8_t rexmit; + u8_t in_write; + u8_t head; +-- +2.23.0 + diff --git a/lwip.spec b/lwip.spec index c782db1..3aec73d 100644 --- a/lwip.spec +++ b/lwip.spec @@ -4,7 +4,7 @@ Summary: lwip is a small independent implementation of the TCP/IP protocol suite Name: lwip Version: 2.1.3 -Release: 36 +Release: 37 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -58,6 +58,7 @@ Patch9042: 0043-add-prefetch.patch Patch9043: 0044-skip-unnecessary-tcp_route.patch Patch9044: 0045-add-variable-in-struct-sock.patch Patch9045: 0046-add-dataack-when-recv-too-many-acks-with-data.patch +Patch9046: 0047-reduce-struct-pbuf-size.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -120,6 +121,7 @@ find %{_builddir}/%{name}-%{version} -type f -exec dos2unix -q {} \; %patch9043 -p1 %patch9044 -p1 %patch9045 -p1 +%patch9046 -p1 %build cd %{_builddir}/%{name}-%{version}/src @@ -135,6 +137,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Wed Dec 21 2022 wuchangsheng - 2.1.3-37 +- reduce struct pbuf size + * Wed Dec 21 2022 kircher - 2.1.3-36 - do not update cwnd when send dataack -- Gitee