These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / sched / sch_plug.c

diff --git a/kernel/net/sched/sch_plug.c b/kernel/net/sched/sch_plug.c
index 89f8fcf..5abfe44 100644 (file)
--- a/kernel/net/sched/sch_plug.c
+++ b/kernel/net/sched/sch_plug.c
@@ -130,12 +130,8 @@ static int plug_init(struct Qdisc *sch, struct nlattr *opt)
        q->unplug_indefinite = false;
 
        if (opt == NULL) {
-               /* We will set a default limit of 100 pkts (~150kB)
-                * in case tx_queue_len is not available. The
-                * default value is completely arbitrary.
-                */
-               u32 pkt_limit = qdisc_dev(sch)->tx_queue_len ? : 100;
-               q->limit = pkt_limit * psched_mtu(qdisc_dev(sch));
+               q->limit = qdisc_dev(sch)->tx_queue_len
+                          * psched_mtu(qdisc_dev(sch));
        } else {
                struct tc_plug_qopt *ctl = nla_data(opt);
 
@@ -216,6 +212,7 @@ static struct Qdisc_ops plug_qdisc_ops __read_mostly = {
        .peek        =       qdisc_peek_head,
        .init        =       plug_init,
        .change      =       plug_change,
+       .reset       =       qdisc_reset_queue,
        .owner       =       THIS_MODULE,
 };