Skip to content

Commit 1e01abe

Browse files
author
Paolo Abeni
committed
net/sched: cls_flower: revert unintended changes
While applying the blamed commit 4ca07b9 ("net: mctp i2c: check length before marking flow active"), I unintentionally included unrelated and unacceptable changes. Revert them. Fixes: 4ca07b9 ("net: mctp i2c: check length before marking flow active") Reported-by: Jeremy Kerr <jk@codeconstruct.com.au> Closes: https://lore.kernel.org/netdev/bd8704fe0bd53e278add5cde4873256656623e2e.camel@codeconstruct.com.au/ Signed-off-by: Paolo Abeni <pabeni@redhat.com> Link: https://patch.msgid.link/043026a53ff84da88b17648c4b0d17f0331749cb.1777447863.git.pabeni@redhat.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 051ffb0 commit 1e01abe

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

net/sched/cls_flower.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@ static int __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f,
556556
struct netlink_ext_ack *extack)
557557
{
558558
struct cls_fl_head *head = fl_head_dereference(tp);
559-
struct fl_flow_mask *mask;
560559

561560
*last = false;
562561

@@ -573,12 +572,11 @@ static int __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f,
573572
list_del_rcu(&f->list);
574573
spin_unlock(&tp->lock);
575574

576-
mask = f->mask;
575+
*last = fl_mask_put(head, f->mask);
577576
if (!tc_skip_hw(f->flags))
578577
fl_hw_destroy_filter(tp, f, rtnl_held, extack);
579578
tcf_unbind_filter(tp, &f->res);
580579
__fl_put(f);
581-
*last = fl_mask_put(head, mask);
582580

583581
return 0;
584582
}

0 commit comments

Comments
 (0)