[openwrt/openwrt] iproute2: update to 5.15

[LEDE Commits]

dedeckeh pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/fa7356dd9d6d88c9aff9dce496dc9eaa0a8d9bda

commit fa7356dd9d6d88c9aff9dce496dc9eaa0a8d9bda
Author: Russell Senior <russell at personaltelco.net>
AuthorDate: Sun Nov 7 15:32:18 2021 -0800

    iproute2: update to 5.15
    
    from https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
    
    changes since 5.14.0:
    
    ad3a118f rdma: Fix SRQ resource tracking information json
    7a235a10 man: devlink-port: fix pfnum for devlink port add
    229eaba5 uapi: pickup fix for xfrm ABI breakage
    a500c5ac lib/bpf: fix map-in-map creation without prepopulation
    7c032cac man: devlink-port: remove extra .br
    04ee8e6f man: devlink-port: fix style
    14802d84 man: devlink-port: fix the devlink port add synopsis
    897772a7 cmd: use spaces instead of tabs for usage indentation
    e7a98a96 mptcp: unbreak JSON endpoint list
    2f5825cb lib: bpf_legacy: fix bpffs mount when /sys/fs/bpf exists
    d756c08a tc/f_flower: fix port range parsing
    92e32f77 uapi: updates from 5.15-rc1
    e7e0e2ce iptuntap: fix multi-queue flag display
    deef844b man: ip-link: remove double of
    a3272b93 configure: restore backward compatibility
    ceba5930 tree-wide: fix some typos found by Lintian
    7a705242 ip: remove leftovers from IPX and DECnet
    8ab1834e uapi: update headers from 5.15 merge
    6d0d35ba ip/bond: add lacp active support
    926ad641 Update kernel headers
    c730bd0b ip/tunnel: always print all known attributes
    df8912ed ipioam6: use print_nl instead of print_null
    7e7270bb tc/skbmod: Introduce SKBMOD_F_ECN option
    86c596ed IOAM man8
    2d83c710 New IOAM6 encap type for routes
    f0b3808a Add, show, link, remove IOAM namespaces and schemas
    acbdef93 Import ioam6 uapi headers
    2d6fa30b Update kernel headers
    508ad89c ipneigh: add support to print brief output of neigh cache in tabular format
    
    * update patch 170-ip_tiny.patch to accomodate ioam.
    
    Signed-off-by: Russell Senior <russell at personaltelco.net>
---
 package/network/utils/iproute2/Makefile                  | 4 ++--
 package/network/utils/iproute2/patches/170-ip_tiny.patch | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index ca3cb4753a..928f44e797 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:=5.14.0
+PKG_VERSION:=5.15.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=210fa785a52f3763c4287fd5ae63e246f6311bfaa48c424baab6d383bb7591d4
+PKG_HASH:=38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch
index 2c1ec1dcb3..cd687e7601 100644
--- a/package/network/utils/iproute2/patches/170-ip_tiny.patch
+++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch
@@ -30,7 +30,7 @@
  		"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
  		"       ip [ -force ] -batch filename\n"
 +#ifndef IPROUTE2_TINY
- 		"where  OBJECT := { address | addrlabel | fou | help | ila | l2tp | link |\n"
+ 		"where  OBJECT := { address | addrlabel | fou | help | ila | ioam | l2tp | link |\n"
  		"                   macsec | maddress | monitor | mptcp | mroute | mrule |\n"
  		"                   neighbor | neighbour | netconf | netns | nexthop | ntable |\n"
  		"                   ntbl | route | rule | sr | tap | tcpmetrics |\n"
@@ -43,7 +43,7 @@
  		"       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
  		"                    -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
  		"                    -f[amily] { inet | inet6 | mpls | bridge | link } |\n"
-@@ -91,36 +97,50 @@ static const struct cmd {
+@@ -91,37 +97,51 @@ static const struct cmd {
  	int (*func)(int argc, char **argv);
  } cmds[] = {
  	{ "address",	do_ipaddr },
@@ -90,6 +90,7 @@
 +#ifndef IPROUTE2_TINY
  	{ "nexthop",	do_ipnh },
  	{ "mptcp",	do_mptcp },
+ 	{ "ioam",	do_ioam6 },
 +#endif
  	{ "help",	do_help },
  	{ 0 }