diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-09 23:10:26 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-09 23:13:43 +0300 |
| commit | a2d6d7ae591c47ebc04926cb29a840adfdde49e6 (patch) | |
| tree | be464f987f0ab690481e2783d680aa88574026e4 /net/sched | |
| parent | b1daa4d194731ab484fb22742506dd25ad1a5628 (diff) | |
| parent | e69ec487b2c7c82ef99b4b15122f58a2a99289a3 (diff) | |
| download | linux-a2d6d7ae591c47ebc04926cb29a840adfdde49e6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The ungrafting from PRIO bug fixes in net, when merged into net-next,
merge cleanly but create a build failure. The resolution used here is
from Petr Machata.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_cake.c | 2 | ||||
| -rw-r--r-- | net/sched/sch_fq.c | 6 | ||||
| -rw-r--r-- | net/sched/sch_prio.c | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index 6cc3ab145513..90ef7cc79b69 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1768,7 +1768,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch, q->avg_window_begin)); u64 b = q->avg_window_bytes * (u64)NSEC_PER_SEC; - do_div(b, window_interval); + b = div64_u64(b, window_interval); q->avg_peak_bandwidth = cake_ewma(q->avg_peak_bandwidth, b, b > q->avg_peak_bandwidth ? 2 : 8); diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c index ff4c5e9d0d77..a5a295477ecc 100644 --- a/net/sched/sch_fq.c +++ b/net/sched/sch_fq.c @@ -786,10 +786,12 @@ static int fq_change(struct Qdisc *sch, struct nlattr *opt, if (tb[TCA_FQ_QUANTUM]) { u32 quantum = nla_get_u32(tb[TCA_FQ_QUANTUM]); - if (quantum > 0) + if (quantum > 0 && quantum <= (1 << 20)) { q->quantum = quantum; - else + } else { + NL_SET_ERR_MSG_MOD(extack, "invalid quantum"); err = -EINVAL; + } } if (tb[TCA_FQ_INITIAL_QUANTUM]) diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 18b884cfdfe8..647941702f9f 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c @@ -292,8 +292,14 @@ static int prio_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, struct tc_prio_qopt_offload graft_offload; unsigned long band = arg - 1; - if (new == NULL) - new = &noop_qdisc; + if (!new) { + new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, + TC_H_MAKE(sch->handle, arg), extack); + if (!new) + new = &noop_qdisc; + else + qdisc_hash_add(new, true); + } *old = qdisc_replace(sch, new, &q->queues[band]); |