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

Commit ef58ca38 authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller
Browse files

net/sched/sch_prio.c: work around gcc-4.4.4 union initializer issues 



gcc-4.4.4 has problems witn anon union initializers.  Work around this.

net/sched/sch_prio.c: In function 'prio_dump_offload':
net/sched/sch_prio.c:260: error: unknown field 'stats' specified in initializer
net/sched/sch_prio.c:260: warning: initialization makes integer from pointer without a cast
net/sched/sch_prio.c:261: error: unknown field 'stats' specified in initializer
net/sched/sch_prio.c:261: warning: initialization makes integer from pointer without a cast

Fixes: 7fdb61b4 ("net: sch: prio: Add offload ability to PRIO qdisc")
Cc: Nogah Frankel <nogahf@mellanox.com>
Cc: Yuval Mintz <yuvalm@mellanox.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89290b83

net/sched/sch_prio.c

+7 −3
Original line number Diff line number Diff line
@@ -254,11 +254,15 @@ static int prio_dump_offload(struct Qdisc *sch) 
{

	struct net_device *dev = qdisc_dev(sch);

	struct tc_prio_qopt_offload hw_stats = {

		.command = TC_PRIO_STATS,

		.handle = sch->handle,

		.parent = sch->parent,

		.command = TC_PRIO_STATS,

		.stats.bstats = &sch->bstats,

		.stats.qstats = &sch->qstats,

		{

			.stats = {

				.bstats = &sch->bstats,

				.qstats = &sch->qstats,

			},

		},

	};

	int err;