Commit 382ceac7 authored by Lu Wei's avatar Lu Wei Committed by Zheng Zengkai
Browse files

ipvlan: Modify the value of ipvlan modes 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I52H2U


CVE: NA

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

The L2E mode of ipvlan is introduced in 4.19, and the mode value
IPVLAN_MODE_L2E is inserted between IPVLAN_MODE_L3 and IPVLAN_MODE_L3S
in enum ipvlan_mode as follows:
	enum ipvlan_mode {
		IPVLAN_MODE_L2 = 0,
		IPVLAN_MODE_L3,
	      + IPVLAN_MODE_L2E,
		IPVLAN_MODE_L3S,
		IPVLAN_MODE_MAX
	};

that means the value of IPVLAN_MODE_L3S is changed from 2 to 3, and
it is different from other operation system like SUSE, rethad and etc.

In order to fix it, IPVLAN_MODE_L2E is placed behind IPVLAN_MODE_L3S in
5.10. However it is incompatible with iproute tool since iproute defines
enum ipvlan_mode as it does in 4.19. So this patch moves the IPVLAN_MODE_L2E
back to keep incompatible with iproute tool.

Fixes: bd73acb1 ("ipvlan: Introduce l2e mode")
Signed-off-by: default avatarLu Wei <luwei32@huawei.com>
Reviewed-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 88d74c39

drivers/net/ipvlan/ipvlan_main.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ int sysctl_ipvlan_loop_qlen = 131072; 
int sysctl_ipvlan_loop_delay = 10;

static int ipvlan_default_mode = IPVLAN_MODE_L3;

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 l3s, 3 for l2e, others invalid now");

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");



static struct ctl_table_header *ipvlan_table_hrd;

static struct ctl_table ipvlan_table[] = {

include/uapi/linux/if_link.h

+1 −1
Original line number Diff line number Diff line
@@ -689,8 +689,8 @@ enum { 
enum ipvlan_mode {

	IPVLAN_MODE_L2 = 0,

	IPVLAN_MODE_L3,

	IPVLAN_MODE_L3S,

	IPVLAN_MODE_L2E,

	IPVLAN_MODE_L3S,

	IPVLAN_MODE_MAX

};