From: Andrew Morton <[email protected]>
Subject: 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: 7fdb61b44c0c95 ("net: sch: prio: Add offload ability to PRIO qdisc")
Cc: Nogah Frankel <[email protected]>
Cc: Yuval Mintz <[email protected]>
Cc: Jiri Pirko <[email protected]>
Cc: David S. Miller <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
net/sched/sch_prio.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff -puN
net/sched/sch_prio.c~net-sched-sch_prioc-work-around-gcc-444-union-initializer-issues
net/sched/sch_prio.c
---
a/net/sched/sch_prio.c~net-sched-sch_prioc-work-around-gcc-444-union-initializer-issues
+++ a/net/sched/sch_prio.c
@@ -254,11 +254,15 @@ static int prio_dump_offload(struct Qdis
{
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;
_
