Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5026c9b1 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

net sched: vlan action fix late binding 



Late vlan action binding was broken and is fixed with this patch.

//add a vlan action to pop and give it an instance id of 1
sudo tc actions add action vlan pop index 1
//create filter which binds to vlan action id 1
sudo tc filter add dev $DEV parent ffff: protocol ip prio 1 u32 \
match ip dst 17.0.0.1/32 flowid 1:1 action vlan index 1

current message(before bug fix) was:
RTNETLINK answers: Invalid argument
We have an error talking to the kernel

Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84a527a4

net/sched/act_vlan.c

+16 −6
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, 
	int action;

	__be16 push_vid = 0;

	__be16 push_proto = 0;

	int ret = 0;

	int ret = 0, exists = 0;

	int err;



	if (!nla)
@@ -90,15 +90,25 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, 
	if (!tb[TCA_VLAN_PARMS])

		return -EINVAL;

	parm = nla_data(tb[TCA_VLAN_PARMS]);

	exists = tcf_hash_check(tn, parm->index, a, bind);

	if (exists && bind)

		return 0;



	switch (parm->v_action) {

	case TCA_VLAN_ACT_POP:

		break;

	case TCA_VLAN_ACT_PUSH:

		if (!tb[TCA_VLAN_PUSH_VLAN_ID])

		if (!tb[TCA_VLAN_PUSH_VLAN_ID]) {

			if (exists)

				tcf_hash_release(a, bind);

			return -EINVAL;

		}

		push_vid = nla_get_u16(tb[TCA_VLAN_PUSH_VLAN_ID]);

		if (push_vid >= VLAN_VID_MASK)

		if (push_vid >= VLAN_VID_MASK) {

			if (exists)

				tcf_hash_release(a, bind);

			return -ERANGE;

		}



		if (tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]) {

			push_proto = nla_get_be16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]);
@@ -114,11 +124,13 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, 
		}

		break;

	default:

		if (exists)

			tcf_hash_release(a, bind);

		return -EINVAL;

	}

	action = parm->v_action;



	if (!tcf_hash_check(tn, parm->index, a, bind)) {

	if (!exists) {

		ret = tcf_hash_create(tn, parm->index, est, a,

				      sizeof(*v), bind, false);

		if (ret)
@@ -126,8 +138,6 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, 


		ret = ACT_P_CREATED;

	} else {

		if (bind)

			return 0;

		tcf_hash_release(a, bind);

		if (!ovr)

			return -EEXIST;