Unverified Commit ddbb3ee7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9862 ipvlan: Modify the value of ipvlan modes 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YBQNXO7SGAOEIV3N6ONPRVY6V7PQGHMN/ 
 
https://gitee.com/openeuler/kernel/issues/IAC95A 
 
Link:https://gitee.com/openeuler/kernel/pulls/9862

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 15f539c4 02b9f90a

drivers/net/ipvlan/ipvlan_main.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,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 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 ipvlan_table[] = {

include/uapi/linux/if_link.h

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

	IPVLAN_MODE_L2 = 0,

	IPVLAN_MODE_L3,

	IPVLAN_MODE_L2E,

	IPVLAN_MODE_L3S,

	IPVLAN_MODE_L2E,

	IPVLAN_MODE_MAX

};