summaryrefslogtreecommitdiffstats
path: root/net/sched/sch_plug.c
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2015-08-18 10:30:49 +0200
committerDavid S. Miller <davem@davemloft.net>2015-08-18 11:55:08 -0700
commit348e3435cbefa815bd56a5205c1412b5afe7b92e (patch)
tree018c84769b8c270f6bec9020da36e9916985a061 /net/sched/sch_plug.c
parent906470c19da771e638e7c8e16e16c31995b139cc (diff)
downloadop-kernel-dev-348e3435cbefa815bd56a5205c1412b5afe7b92e.zip
op-kernel-dev-348e3435cbefa815bd56a5205c1412b5afe7b92e.tar.gz
net: sched: drop all special handling of tx_queue_len == 0
Those were all workarounds for the formerly double meaning of tx_queue_len, which broke scheduling algorithms if untreated. Now that all in-tree drivers have been converted away from setting tx_queue_len = 0, it should be safe to drop these workarounds for categorically broken setups. Signed-off-by: Phil Sutter <phil@nwl.cc> Cc: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_plug.c')
-rw-r--r--net/sched/sch_plug.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/sched/sch_plug.c b/net/sched/sch_plug.c
index ade9445..5abfe44 100644
--- a/net/sched/sch_plug.c
+++ b/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);
OpenPOWER on IntegriCloud