libbpf: update to 1.7.0

Release Notes:
- https://github.com/libbpf/libbpf/releases/tag/v1.6.3
- https://github.com/libbpf/libbpf/releases/tag/v1.7.0

Link: https://github.com/openwrt/openwrt/pull/22971
Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/package/libs/libbpf/Makefile b/package/libs/libbpf/Makefile
index 8cdcd8384de641b25ef824a7e53176011d106842..c5cb4e197218204e8eccf6b2a8ae72086db42496 100644 (file)
--- a/package/libs/libbpf/Makefile
+++ b/package/libs/libbpf/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbpf
-PKG_VERSION:=1.6.2
+PKG_VERSION:=1.7.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://github.com/libbpf/libbpf
-PKG_MIRROR_HASH:=9620f45b4fc0ee5e0f43502634fe48fbcb34ab49d2553b7275fa92f7e02d3dc7
+PKG_MIRROR_HASH:=30fbb65adcb4ce7e5eac797edbb81ede5e00969f8eb6a871b9e7913eda4e8ba4
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_ABI_VERSION:=$(firstword $(subst .,$(space),$(PKG_VERSION)))

diff --git a/package/libs/libbpf/patches/100-bpf_tc_classid.patch b/package/libs/libbpf/patches/100-bpf_tc_classid.patch
index a68fc35e193e6578fd33d92485026ee1474ff77c..48b25e33b299df8a849134778c5253b598984d1a 100644 (file)
--- a/package/libs/libbpf/patches/100-bpf_tc_classid.patch
+++ b/package/libs/libbpf/patches/100-bpf_tc_classid.patch
@@ -1,6 +1,6 @@
 --- a/src/libbpf.h
 +++ b/src/libbpf.h
-@@ -1332,9 +1332,10 @@ struct bpf_tc_opts {
+@@ -1396,9 +1396,10 @@ struct bpf_tc_opts {
        __u32 prog_id;
        __u32 handle;
        __u32 priority;
@@ -14,7 +14,7 @@
  LIBBPF_API int bpf_tc_hook_destroy(struct bpf_tc_hook *hook);
 --- a/src/netlink.c
 +++ b/src/netlink.c
-@@ -687,6 +687,8 @@ static int __get_tc_info(void *cookie, s
+@@ -689,6 +689,8 @@ static int __get_tc_info(void *cookie, s
        OPTS_SET(info->opts, prog_id, libbpf_nla_getattr_u32(tbb[TCA_BPF_ID]));
        OPTS_SET(info->opts, handle, tc->tcm_handle);
        OPTS_SET(info->opts, priority, TC_H_MAJ(tc->tcm_info) >> 16);
@@ -23,7 +23,7 @@
  
        info->processed = true;
        return unicast ? NL_NEXT : NL_DONE;
-@@ -731,7 +733,7 @@ static int tc_add_fd_and_name(struct lib
+@@ -733,7 +735,7 @@ static int tc_add_fd_and_name(struct lib
  
  int bpf_tc_attach(const struct bpf_tc_hook *hook, struct bpf_tc_opts *opts)
  {
@@ -32,7 +32,7 @@
        int ret, ifindex, attach_point, prog_fd;
        struct bpf_cb_ctx info = {};
        struct libbpf_nla_req req;
-@@ -751,6 +753,7 @@ int bpf_tc_attach(const struct bpf_tc_ho
+@@ -753,6 +755,7 @@ int bpf_tc_attach(const struct bpf_tc_ho
        prog_fd      = OPTS_GET(opts, prog_fd, 0);
        prog_id      = OPTS_GET(opts, prog_id, 0);
        flags        = OPTS_GET(opts, flags, 0);
@@ -40,7 +40,7 @@
  
        if (ifindex <= 0 || !prog_fd || prog_id)
                return libbpf_err(-EINVAL);
-@@ -790,6 +793,11 @@ int bpf_tc_attach(const struct bpf_tc_ho
+@@ -792,6 +795,11 @@ int bpf_tc_attach(const struct bpf_tc_ho
        ret = nlattr_add(&req, TCA_BPF_FLAGS, &bpf_flags, sizeof(bpf_flags));
        if (ret < 0)
                return libbpf_err(ret);