diff --git a/iproute.spec b/iproute.spec index 6b27e2920dcb11b3013fcaeec368bc7b3426256c..7a02e6284c5ed01eefb1f7940b73965259e1b3a0 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Name: iproute Version: 5.15.0 Epoch: 1 -Release: 14 +Release: 15 Summary: Linux network configuration utilities License: GPLv2+ and Public Domain URL: https://kernel.org/pub/linux/utils/net/iproute2/ @@ -47,6 +47,7 @@ Patch6030: backport-rt_names-check-for-malloc-failure.patch Patch9000: feature-iproute-add-support-for-ipvlan-l2e-mode.patch Patch9001: bugfix-iproute2-cancel-some-test-cases.patch +Patch9002: sync-ipvlan_mode-enum-with-kernel-headers.patch BuildRequires: gcc bison elfutils-libelf-devel flex iptables-devel BuildRequires: libmnl-devel libselinux-devel pkgconfig libbpf-devel sudo make @@ -122,6 +123,12 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_mandir}/* %changelog +* Fri Aug 25 2023 gaoxingwang - 1:5.15.0-15 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: sync ipvlan_mode enum with kernel-headers + * Thu Aug 17 2023 gaoxingwang - 1:5.15.0-14 - Type:bugfix - ID:NA diff --git a/sync-ipvlan_mode-enum-with-kernel-headers.patch b/sync-ipvlan_mode-enum-with-kernel-headers.patch new file mode 100644 index 0000000000000000000000000000000000000000..9958862b443a952bd2d43f2d3b45a7bf75631b4f --- /dev/null +++ b/sync-ipvlan_mode-enum-with-kernel-headers.patch @@ -0,0 +1,26 @@ +From 22f6c8174dca9de68e7a011f580ba07e7d9c15b2 Mon Sep 17 00:00:00 2001 +From: liyunqing +Date: Fri, 16 Jun 2023 17:48:11 +0800 +Subject: [PATCH] sync ipvlan_mode enum with kernel-headers + +--- + include/uapi/linux/if_link.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h +index bddbdc7..1c6f6b1 100644 +--- a/include/uapi/linux/if_link.h ++++ b/include/uapi/linux/if_link.h +@@ -702,8 +702,8 @@ enum { + enum ipvlan_mode { + IPVLAN_MODE_L2 = 0, + IPVLAN_MODE_L3, +- IPVLAN_MODE_L2E, + IPVLAN_MODE_L3S, ++ IPVLAN_MODE_L2E, + IPVLAN_MODE_MAX + }; + +-- +2.33.0 +