diff options
| author | Petr Machata <petrm@mellanox.com> | 2020-07-14 20:03:08 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-07-16 16:48:34 -0700 |
| commit | ac5c66f261b7174d0d9aaeb2bf9f8c2c2dbad0bd (patch) | |
| tree | 4a873e972e1bcde088a7204b4511299ddcbf04fd /net/sched/sch_prio.c | |
| parent | 55f656cdb851bae32980d83d2494201e79d93b63 (diff) | |
| download | linux-ac5c66f261b7174d0d9aaeb2bf9f8c2c2dbad0bd.tar.bz2 | |
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_prio.c')
| -rw-r--r-- | net/sched/sch_prio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 46b7ce81c6e3..3eabb871a1d5 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c @@ -65,8 +65,8 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) return q->queues[band]; } -static int prio_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock, - struct sk_buff **to_free) +static int +prio_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free) { unsigned int len = qdisc_pkt_len(skb); struct Qdisc *qdisc; @@ -83,7 +83,7 @@ static int prio_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root } #endif - ret = qdisc_enqueue(skb, qdisc, root_lock, to_free); + ret = qdisc_enqueue(skb, qdisc, to_free); if (ret == NET_XMIT_SUCCESS) { sch->qstats.backlog += len; sch->q.qlen++; |