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

Commit 8234af2d authored by Nogah Frankel's avatar Nogah Frankel Committed by David S. Miller
Browse files

net_sch: red: Fix the new offload indication 



Update the offload flag, TCQ_F_OFFLOADED, in each dump call (and ignore
the offloading function return value in relation to this flag).
This is done because a qdisc is being initialized, and therefore offloaded
before being grafted. Since the ability of the driver to offload the qdisc
depends on its location, a qdisc can be offloaded and un-offloaded by graft
calls, that doesn't effect the qdisc itself.

Fixes: 428a68af ("net: sched: Move to new offload indication in RED"
Signed-off-by: default avatarNogah Frankel <nogahf@mellanox.com>
Reviewed-by: default avatarYuval Mintz <yuvalm@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75ce7191

net/sched/sch_red.c

+14 −12
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ static int red_offload(struct Qdisc *sch, bool enable) 
		.handle = sch->handle,

		.parent = sch->parent,

	};

	int err;



	if (!tc_can_offload(dev) || !dev->netdev_ops->ndo_setup_tc)

		return -EOPNOTSUPP;
@@ -172,14 +171,7 @@ static int red_offload(struct Qdisc *sch, bool enable) 
		opt.command = TC_RED_DESTROY;

	}



	err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_QDISC_RED, &opt);



	if (!err && enable)

		sch->flags |= TCQ_F_OFFLOADED;

	else

		sch->flags &= ~TCQ_F_OFFLOADED;



	return err;

	return dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_QDISC_RED, &opt);

}



static void red_destroy(struct Qdisc *sch)
@@ -297,12 +289,22 @@ static int red_dump_offload_stats(struct Qdisc *sch, struct tc_red_qopt *opt) 
			.stats.qstats = &sch->qstats,

		},

	};

	int err;



	if (!(sch->flags & TCQ_F_OFFLOADED))

	sch->flags &= ~TCQ_F_OFFLOADED;



	if (!tc_can_offload(dev) || !dev->netdev_ops->ndo_setup_tc)

		return 0;



	return dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_QDISC_RED,

	err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_QDISC_RED,

					    &hw_stats);

	if (err == -EOPNOTSUPP)

		return 0;



	if (!err)

		sch->flags |= TCQ_F_OFFLOADED;



	return err;

}



static int red_dump(struct Qdisc *sch, struct sk_buff *skb)