Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net/sched: cls_flower: revert unintended changes
While applying the blamed commit 4ca07b9239bd ("net: mctp i2c: check
length before marking flow active"), I unintentionally included
unrelated and unacceptable changes.
Revert them.
Fixes: 4ca07b9239bd ("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
-3
+1
-3
net/sched/cls_flower.c
+1
-3
net/sched/cls_flower.c
···
556
556
struct netlink_ext_ack *extack)
557
557
{
558
558
struct cls_fl_head *head = fl_head_dereference(tp);
559
-
struct fl_flow_mask *mask;
560
559
561
560
*last = false;
562
561
···
572
573
list_del_rcu(&f->list);
573
574
spin_unlock(&tp->lock);
574
575
575
-
mask = f->mask;
576
+
*last = fl_mask_put(head, f->mask);
576
577
if (!tc_skip_hw(f->flags))
577
578
fl_hw_destroy_filter(tp, f, rtnl_held, extack);
578
579
tcf_unbind_filter(tp, &f->res);
579
580
__fl_put(f);
580
-
*last = fl_mask_put(head, mask);
581
581
582
582
return 0;
583
583
}