diff options
| author | Petr Machata <petrm@mellanox.com> | 2020-07-14 20:03:08 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-07-17 02:48:34 +0300 |
| commit | ac5c66f261b7174d0d9aaeb2bf9f8c2c2dbad0bd (patch) | |
| tree | 4a873e972e1bcde088a7204b4511299ddcbf04fd /net/sched/sch_cbq.c | |
| parent | 55f656cdb851bae32980d83d2494201e79d93b63 (diff) | |
| download | linux-ac5c66f261b7174d0d9aaeb2bf9f8c2c2dbad0bd.tar.xz | |
Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"
This reverts commit aebe4426ccaa4838f36ea805cdf7d76503e65117.
Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/sched/sch_cbq.c')
| -rw-r--r-- | net/sched/sch_cbq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 9e16fdf47fe7..b2130df933a7 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -356,7 +356,7 @@ cbq_mark_toplevel(struct cbq_sched_data *q, struct cbq_class *cl) } static int -cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock, +cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free) { struct cbq_sched_data *q = qdisc_priv(sch); @@ -373,7 +373,7 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock, return ret; } - ret = qdisc_enqueue(skb, cl->q, root_lock, to_free); + ret = qdisc_enqueue(skb, cl->q, to_free); if (ret == NET_XMIT_SUCCESS) { sch->q.qlen++; cbq_mark_toplevel(q, cl); |