summaryrefslogtreecommitdiffstats
path: root/net/sched/sch_prio.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-10-16 22:00:41 +0200
committerDavid S. Miller <davem@davemloft.net>2017-10-16 22:00:41 +0200
commit745482e0c03793522fa19f06e6249b521d6adca1 (patch)
tree98231ebad9efdccc7f11d1c85067190e87b1bacb /net/sched/sch_prio.c
parentmqprio: Reserve last 32 classid values for HW traffic classes and misc IDs (diff)
parentnet: sched: propagate q and parent from caller down to tcf_fill_node (diff)
downloadlinux-745482e0c03793522fa19f06e6249b521d6adca1.tar.xz
linux-745482e0c03793522fa19f06e6249b521d6adca1.zip
Merge branch 'sched-tp_q-remove'
Jiri Pirko <jiri@mellanox.com> ==================== net: sched: remove some tp->q usage In order to prepare for block sharing, tcf_proto instances need to be independent on particular qdisc instances. This patchset takes care of removal of couple occurrences of tp->q usage. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_prio.c')
-rw-r--r--net/sched/sch_prio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 2dd6c68ae91e..95fad348c8d7 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -212,7 +212,7 @@ static int prio_init(struct Qdisc *sch, struct nlattr *opt)
if (!opt)
return -EINVAL;
- err = tcf_block_get(&q->block, &q->filter_list);
+ err = tcf_block_get(&q->block, &q->filter_list, sch);
if (err)
return err;