提交 1e0c4666 编写于 作者: L Lu Wei 提交者: Zheng Zengkai

Revert "ipvlan: Modify the value of ipvlan modes"

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I62TLE
CVE: NA

--------------------------------

This reverts commit 382ceac7.

In order to make iproute compatible with other operation system like
SUSE, rethad and etc, put IPVLAN_MODE_L2E last.
Signed-off-by: NLu Wei <luwei32@huawei.com>
Reviewed-by: NLiu Jian <liujian56@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 7b66176e
...@@ -14,7 +14,7 @@ int sysctl_ipvlan_loop_qlen = 131072; ...@@ -14,7 +14,7 @@ int sysctl_ipvlan_loop_qlen = 131072;
int sysctl_ipvlan_loop_delay = 10; int sysctl_ipvlan_loop_delay = 10;
static int ipvlan_default_mode = IPVLAN_MODE_L3; static int ipvlan_default_mode = IPVLAN_MODE_L3;
module_param(ipvlan_default_mode, int, 0400); module_param(ipvlan_default_mode, int, 0400);
MODULE_PARM_DESC(ipvlan_default_mode, "set ipvlan default mode: 0 for l2, 1 for l3, 2 for l2e, 3 for l3s, others invalid now"); MODULE_PARM_DESC(ipvlan_default_mode, "set ipvlan default mode: 0 for l2, 1 for l3, 2 for l3s, 3 for l2e, others invalid now");
static struct ctl_table_header *ipvlan_table_hrd; static struct ctl_table_header *ipvlan_table_hrd;
static struct ctl_table ipvlan_table[] = { static struct ctl_table ipvlan_table[] = {
......
...@@ -689,8 +689,8 @@ enum { ...@@ -689,8 +689,8 @@ enum {
enum ipvlan_mode { enum ipvlan_mode {
IPVLAN_MODE_L2 = 0, IPVLAN_MODE_L2 = 0,
IPVLAN_MODE_L3, IPVLAN_MODE_L3,
IPVLAN_MODE_L2E,
IPVLAN_MODE_L3S, IPVLAN_MODE_L3S,
IPVLAN_MODE_L2E,
IPVLAN_MODE_MAX IPVLAN_MODE_MAX
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册