Merge tag 'mfd-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[mirror_ubuntu-artful-kernel.git] / net / sched / sch_generic.c

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 6eb9c8e88519a36fc3ef82be7c7f1dbe0ef1e13c..b052b27a984e39c244c94132f1162a7033e5cc63 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -247,7 +247,7 @@ static inline int qdisc_restart(struct Qdisc *q, int *packets)
 
 void __qdisc_run(struct Qdisc *q)
 {
-       int quota = weight_p;
+       int quota = dev_tx_weight;
        int packets;
 
        while (qdisc_restart(q, &packets)) {