diff options
| author | Petr Machata <petrm@mellanox.com> | 2020-07-14 19:03:08 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-07-17 01:48:34 +0200 |
| commit | ac5c66f261b7174d0d9aaeb2bf9f8c2c2dbad0bd (patch) | |
| tree | 4a873e972e1bcde088a7204b4511299ddcbf04fd /net/sched/sch_drr.c | |
| parent | net: sched: Do not drop root lock in tcf_qevent_handle() (diff) | |
| download | linux-ac5c66f261b7174d0d9aaeb2bf9f8c2c2dbad0bd.tar.xz linux-ac5c66f261b7174d0d9aaeb2bf9f8c2c2dbad0bd.zip | |
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_drr.c')
| -rw-r--r-- | net/sched/sch_drr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c index ad14df2ecf3a..dde564670ad8 100644 --- a/net/sched/sch_drr.c +++ b/net/sched/sch_drr.c @@ -337,7 +337,7 @@ static struct drr_class *drr_classify(struct sk_buff *skb, struct Qdisc *sch, return NULL; } -static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock, +static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free) { unsigned int len = qdisc_pkt_len(skb); @@ -355,7 +355,7 @@ static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_ } first = !cl->qdisc->q.qlen; - err = qdisc_enqueue(skb, cl->qdisc, root_lock, to_free); + err = qdisc_enqueue(skb, cl->qdisc, to_free); if (unlikely(err != NET_XMIT_SUCCESS)) { if (net_xmit_drop_count(err)) { cl->qstats.drops++; |