OSDN Git Service

net/sched/sch_prio.c: work around gcc-4.4.4 union initializer issues
authorAndrew Morton <akpm@linux-foundation.org>
Fri, 19 Jan 2018 00:30:49 +0000 (16:30 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Jan 2018 02:11:31 +0000 (21:11 -0500)
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 <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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_prio.c

index a398502..efbf51f 100644 (file)
@@ -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;