From: Ankur Tyagi <ankur.tyagi85@gmail.com>
Date: Tue, 4 Nov 2025 04:34:04 +0000 (+1300)
Subject: iproute2: upgrade 6.16.0 -> 6.17.0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e9cd3c20c1794f70ee919384567e7b318ff729e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

iproute2: upgrade 6.16.0 -> 6.17.0

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---

diff --git a/meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch b/meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch
new file mode 100644
index 0000000000..5315358024
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/0002-lib-bridge-avoid-redefinition-of-in6_addr.patch
@@ -0,0 +1,34 @@
+From ad944bd173cacc098f224e7db7248d7210821fca Mon Sep 17 00:00:00 2001
+From: Yureka <yureka@cyberchaos.dev>
+Date: Sun, 12 Oct 2025 14:39:47 +0200
+Subject: [PATCH] lib: bridge: avoid redefinition of in6_addr
+
+On musl libc, which does not use the kernel definitions of in6_addr, including
+the libc headers after the kernel (UAPI) headers would cause a redefinition
+error. The opposite order avoids the redefinition.
+
+Fixes: 9e89d5b94d749f37525cd8778311e1c9f28f172a
+Signed-off-by: Yureka <yureka@cyberchaos.dev>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+
+Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=25b2834cc974729229afcd308f127995405f85c5]
+(cherry picked from commit 25b2834cc974729229afcd308f127995405f85c5)
+Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
+---
+ lib/bridge.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/bridge.c b/lib/bridge.c
+index 5386aa01..104f5858 100644
+--- a/lib/bridge.c
++++ b/lib/bridge.c
+@@ -2,8 +2,8 @@
+ 
+ #include <net/if.h>
+ 
+-#include "bridge.h"
+ #include "utils.h"
++#include "bridge.h"
+ 
+ void bridge_print_vlan_flags(__u16 flags)
+ {
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.16.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb
similarity index 95%
rename from meta/recipes-connectivity/iproute2/iproute2_6.16.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb
index dc7106902c..59e8a7311d 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_6.16.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_6.17.0.bb
@@ -13,9 +13,10 @@ DEPENDS = "flex-native bison-native libcap"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
            file://0001-include-libnetlink.h-add-missing-include-for-htobe64.patch \
+           file://0002-lib-bridge-avoid-redefinition-of-in6_addr.patch \
            "
 
-SRC_URI[sha256sum] = "5900ccc15f9ac3bf7b7eae81deb5937123df35e99347a7f11a22818482f0a8d0"
+SRC_URI[sha256sum] = "9781e59410ab7dea8e9f79bb10ff1488e63d10fcbb70503b94426ba27a8e2dec"
 
 inherit update-alternatives bash-completion pkgconfig