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: NLu Wei <luwei32@huawei.com>
Reviewed-by: NWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>