!780 adapt for dpdk-23.11

From: @jiangheng12 
Reviewed-by: @LemmyHuang 
Signed-off-by: @LemmyHuang

0103-adapt-for-dpdk-23.11.patch

@@ -17,10 +17,24 @@ Subject: [PATCH] adapt for dpdk-23.11
  10 files changed, 49 insertions(+), 30 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 480470f..f445601 100644
+index 480470f..ce059e1 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -19,9 +19,6 @@ ARFLAGS = crDP
+@@ -2,7 +2,12 @@ LWIP_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+ ROOT_DIR := $(dir $(abspath $(LWIP_DIR)))
+ 
+ LWIP_INC = $(LWIP_DIR)/include
+-DPDK_INCLUDE_FILE ?= /usr/include/dpdk
++DPDK_VERSION := $(shell rpm -q --queryformat '%{VERSION}' dpdk)
++ifeq ($(DPDK_VERSION),21.11)
++    DPDK_INCLUDE_FILE := /usr/local/include
++else
++    DPDK_INCLUDE_FILE := /usr/include/dpdk
++endif
+ 
+ SEC_FLAGS = -fstack-protector-strong -Werror -Wall -Wl,-z,relro,-z,now -Wl,-z,noexecstack -Wtrampolines -fPIC -D_FORTIRY_SOURCE=2 -O2
+ 
+@@ -19,9 +24,6 @@ ARFLAGS = crDP
  ifeq ($(shell $(CC) -dumpmachine | cut -d"-" -f1), x86_64)
      CFLAGS += -mssse3
  endif
@@ -176,7 +190,7 @@ index c150b38..718f9f4 100644
              udpchksum = ip_chksum_pseudo_offload(IP_PROTO_UDP, q->tot_len, &pcb->local_ip, &pcb->remote_ip);
            } else {
 diff --git a/src/include/dpdk_version.h b/src/include/dpdk_version.h
-index 5efaa39..b38416a 100644
+index 5efaa39..df3adb5 100644
 --- a/src/include/dpdk_version.h
 +++ b/src/include/dpdk_version.h
 @@ -33,23 +33,47 @@

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: 111
+Release: 112
 License: BSD
 URL:     http://savannah.nongnu.org/projects/lwip/
 Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip
@@ -152,6 +152,9 @@ cd %{_builddir}/%{name}-%{version}/src
 %{_libdir}/liblwip.a
 
 %changelog
+* Wed Jan 24 2024 jiangheng <jiangheng14@huawei.com> - 2.1.3-112
+- adapt for dpdk-23.11
+
 * Fri Jan 19 2024 jiangheng <jiangheng14@huawei.com> - 2.1.3-111
 - remove unnecessary variables in struct pbuf