Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44edf2f8 authored Dec 25, 2017 by Nogah Frankel Committed by David S. Miller Jan 02, 2018

net: sched: Move offload check till after dump call



Move the check of the offload state to after the qdisc dump action was
called, so the qdisc could update it if it was changed.

Fixes: 7a4fa291 ("net: sched: Add TCA_HW_OFFLOAD")
Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Reviewed-by: Yuval Mintz <yuvalm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8234af2d

net/sched/sch_api.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -807,11 +807,10 @@ static int tc_fill_qdisc(struct sk_buff skb, struct Qdisc q, u32 clid,
		tcm->tcm_info = refcount_read(&q->refcnt);
		if (nla_put_string(skb, TCA_KIND, q->ops->id))
		goto nla_put_failure;
		if (nla_put_u8(skb, TCA_HW_OFFLOAD, !!(q->flags & TCQ_F_OFFLOADED)))
		goto nla_put_failure;
		if (q->ops->dump && q->ops->dump(q, skb) < 0)
		goto nla_put_failure;

		if (nla_put_u8(skb, TCA_HW_OFFLOAD, !!(q->flags & TCQ_F_OFFLOADED)))
		goto nla_put_failure;
		qlen = qdisc_qlen_sum(q);

		stab = rtnl_dereference(q->stab);