[openwrt/openwrt] iproute2: update to version 6.18

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/5cbafcbb67fe463883e0c985d11203d56dc3e5dc

commit 5cbafcbb67fe463883e0c985d11203d56dc3e5dc
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Mon Dec 8 22:38:25 2025 +0100

    iproute2: update to version 6.18
    
    The removed patch 001-lib-bridge-avoid-redefinition-of-in6_addr.patch
    was integrated upstream.
    
    Changes: https://github.com/iproute2/iproute2/compare/v6.17.0...v6.18.0
    
    The apk size did not increase much:
    Old size for armsr/armv8:
     43778 ip-bridge-6.17.0-r1.apk
    164653 ip-tiny-6.17.0-r1.apk
    208236 tc-bpf-6.17.0-r1.apk
    210209 tc-full-6.17.0-r1.apk
    172483 tc-tiny-6.17.0-r1.apk
    
    new size for armsr/armv8:
     43781 ip-bridge-6.18.0-r1.apk
    164956 ip-tiny-6.18.0-r1.apk
    208578 tc-bpf-6.18.0-r1.apk
    210482 tc-full-6.18.0-r1.apk
    172664 tc-tiny-6.18.0-r1.apk
    
    Link: https://github.com/openwrt/openwrt/pull/21101
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 package/network/utils/iproute2/Makefile            |  4 ++--
 ...lib-bridge-avoid-redefinition-of-in6_addr.patch | 27 ----------------------
 .../patches/130-no_netem_tipc_dcb_man_vdpa.patch   |  2 +-
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 1e02cd01b2..bdb4c1685d 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
-PKG_VERSION:=6.17.0
+PKG_VERSION:=6.18.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=9781e59410ab7dea8e9f79bb10ff1488e63d10fcbb70503b94426ba27a8e2dec
+PKG_HASH:=6ba520e1975e4c50dc931eeae91ea37c198b8a173744885f8895b84325f9d456
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
diff --git a/package/network/utils/iproute2/patches/001-lib-bridge-avoid-redefinition-of-in6_addr.patch b/package/network/utils/iproute2/patches/001-lib-bridge-avoid-redefinition-of-in6_addr.patch
deleted file mode 100644
index 166f15ccf4..0000000000
--- a/package/network/utils/iproute2/patches/001-lib-bridge-avoid-redefinition-of-in6_addr.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7119f3736f689ab396ca4193ac593938affd55fa Mon Sep 17 00:00:00 2001
-From: Yureka <yureka at cyberchaos.dev>
-Date: Sun, 12 Oct 2025 14:39:47 +0200
-Subject: 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 at cyberchaos.dev>
----
- lib/bridge.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- 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/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
index 7f946070f9..25a985d8d8 100644
--- a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
+++ b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
@@ -7,7 +7,7 @@
 -SUBDIRS=lib ip tc bridge misc netem genl man
 +SUBDIRS=lib ip tc bridge misc genl
  ifeq ($(HAVE_MNL),y)
--SUBDIRS += tipc devlink rdma dcb vdpa
+-SUBDIRS += tipc devlink rdma dcb vdpa netshaper
 +SUBDIRS += devlink rdma
  endif