!159 同步22.03-LTS-SP2分支修改到22.03-LTS-SP3,ipvlan_mode枚举与内核保持一致
From: @tmacbb Reviewed-by: @robertxw Signed-off-by: @robertxw
This commit is contained in:
commit
8f855f92fe
@ -2,7 +2,7 @@
|
|||||||
Name: iproute
|
Name: iproute
|
||||||
Version: 5.15.0
|
Version: 5.15.0
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Release: 15
|
Release: 16
|
||||||
Summary: Linux network configuration utilities
|
Summary: Linux network configuration utilities
|
||||||
License: GPLv2+ and Public Domain
|
License: GPLv2+ and Public Domain
|
||||||
URL: https://kernel.org/pub/linux/utils/net/iproute2/
|
URL: https://kernel.org/pub/linux/utils/net/iproute2/
|
||||||
@ -48,6 +48,7 @@ Patch6030: backport-rt_names-check-for-malloc-failure.patch
|
|||||||
Patch9000: feature-iproute-add-support-for-ipvlan-l2e-mode.patch
|
Patch9000: feature-iproute-add-support-for-ipvlan-l2e-mode.patch
|
||||||
Patch9001: bugfix-iproute2-cancel-some-test-cases.patch
|
Patch9001: bugfix-iproute2-cancel-some-test-cases.patch
|
||||||
Patch9002: feature-iproute2-supports-to-parse-UB-device-and-related-display-of-vf-address.patch
|
Patch9002: feature-iproute2-supports-to-parse-UB-device-and-related-display-of-vf-address.patch
|
||||||
|
Patch9003: sync-ipvlan_mode-enum-with-kernel-headers.patch
|
||||||
|
|
||||||
BuildRequires: gcc bison elfutils-libelf-devel flex iptables-devel
|
BuildRequires: gcc bison elfutils-libelf-devel flex iptables-devel
|
||||||
BuildRequires: libmnl-devel libselinux-devel pkgconfig libbpf-devel sudo make
|
BuildRequires: libmnl-devel libselinux-devel pkgconfig libbpf-devel sudo make
|
||||||
@ -123,6 +124,12 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
|
|||||||
%{_mandir}/*
|
%{_mandir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 27 2023 liubo <liubo335@huawei.com> - 1:5.15.0-16
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: sync ipvlan_mode enum with kernel-headers
|
||||||
|
|
||||||
* Sat Nov 25 2023 mufengyan <mufengyan@hisilicon.com> - 1:5.15.0-15
|
* Sat Nov 25 2023 mufengyan <mufengyan@hisilicon.com> - 1:5.15.0-15
|
||||||
- Type:feature
|
- Type:feature
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
26
sync-ipvlan_mode-enum-with-kernel-headers.patch
Normal file
26
sync-ipvlan_mode-enum-with-kernel-headers.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From 22f6c8174dca9de68e7a011f580ba07e7d9c15b2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: liyunqing <liyunqing@kylinos.cn>
|
||||||
|
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
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user