!1345 [sync] PR-1339: fix IFNAMSIZ definition conflict between lwip and kernel

Merge pull request !1345 from openeuler-sync-bot/sync-pr1339-master-to-openEuler-24.03-LTS

0175-fix-IFNAMSIZ-definition-conflict-between-lwip-and-ke.patch

@@ -0,0 +1,32 @@
+From 6a32cc176ccec6a0afa8a6f954a02fa851c99274 Mon Sep 17 00:00:00 2001
+From: yangchen <yangchen145@huawei.com>
+Date: Mon, 11 Nov 2024 15:49:13 +0800
+Subject: [PATCH] fix IFNAMSIZ definition conflict between lwip and kernel
+
+---
+ src/include/lwip/netif.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h
+index 02c0822..3deefb0 100644
+--- a/src/include/lwip/netif.h
++++ b/src/include/lwip/netif.h
+@@ -67,11 +67,15 @@ extern "C" {
+ #define NETIF_MAX_HWADDR_LEN 6U
+ #endif
+ 
++#if GAZELLE_ENABLE
++#define NETIF_NAMESIZE 16 /* same as IFNAMSIZ in net/if.h */
++#else
+ /** The size of a fully constructed netif name which the
+  * netif can be identified by in APIs. Composed of
+  * 2 chars, 3 (max) digits, and 1 \0
+  */
+ #define NETIF_NAMESIZE 6
++#endif
+ 
+ /**
+  * @defgroup netif_flags Flags
+-- 
+2.33.0
+

lwip.spec

@@ -4,7 +4,7 @@
 Summary: lwip is a small independent implementation of the TCP/IP protocol suite
 Name:    lwip
 Version: 2.2.0
-Release: 62
+Release: 63
 License: BSD
 URL:     http://savannah.nongnu.org/projects/lwip/
 Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip
@@ -186,6 +186,7 @@ Patch9170:  0171-IPV6-fix-array-out-of-bounds-in-function-ip6_ntoa_r.patch
 Patch9171:  0172-IPV6-add-group-check-while-mld6-schedule-a-report.patch
 Patch9172:  0173-IGMP-fix-problem-that-can-not-join-the-sixteen-igmp-.patch
 Patch9173:  0174-bugfix-Codedump-occurs-when-the-GAZELLE_TCP_REUSE_IP.patch
+Patch9174:  0175-fix-IFNAMSIZ-definition-conflict-between-lwip-and-ke.patch
 
 BuildRequires: gcc-c++ dos2unix dpdk-devel
 
@@ -215,6 +216,9 @@ cd %{_builddir}/%{name}-%{version}/src
 %{_libdir}/liblwip.a
 
 %changelog
+* Mon Nov 11 2024 yangchen <yangchen145@huawei.com> - 2.2.0-63
+- fix IFNAMSIZ definition conflict between lwip and kernel
+
 * Fri Nov 1 2024 hankangkang <hankangkang5@huawei.com> - 2.2.0-62
 - When the GAZELLE_TCP_REUSE_IPPORT is on, min_cnts_lpcb is NULL
 - Turn on the LWIP_SO-LINGER switch