Commit 1e01abec authored by Paolo Abeni's avatar Paolo Abeni
Browse files

net/sched: cls_flower: revert unintended changes 



While applying the blamed commit 4ca07b92 ("net: mctp i2c: check
length before marking flow active"), I unintentionally included
unrelated and unacceptable changes.

Revert them.

Fixes: 4ca07b92 ("net: mctp i2c: check length before marking flow active")
Reported-by: default avatarJeremy Kerr <jk@codeconstruct.com.au>
Closes: https://lore.kernel.org/netdev/bd8704fe0bd53e278add5cde4873256656623e2e.camel@codeconstruct.com.au/


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Link: https://patch.msgid.link/043026a53ff84da88b17648c4b0d17f0331749cb.1777447863.git.pabeni@redhat.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 051ffb00

net/sched/cls_flower.c

+1 −3
Original line number Diff line number Diff line
@@ -556,7 +556,6 @@ static int __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f, 
		       struct netlink_ext_ack *extack)

{

	struct cls_fl_head *head = fl_head_dereference(tp);

	struct fl_flow_mask *mask;



	*last = false;
@@ -573,12 +572,11 @@ static int __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f, 
	list_del_rcu(&f->list);

	spin_unlock(&tp->lock);



	mask = f->mask;

	*last = fl_mask_put(head, f->mask);

	if (!tc_skip_hw(f->flags))

		fl_hw_destroy_filter(tp, f, rtnl_held, extack);

	tcf_unbind_filter(tp, &f->res);

	__fl_put(f);

	*last = fl_mask_put(head, mask);



	return 0;

}