net/sched/sch_red.c: work around gcc-4.4.4 anon union initializer issue

gcc-4.4.4 (at lest) has issues with initializers and anonymous unions:

net/sched/sch_red.c: In function 'red_dump_offload':
net/sched/sch_red.c:282: error: unknown field 'stats' specified in initializer
net/sched/sch_red.c:282: warning: initialization makes integer from pointer without a cast
net/sched/sch_red.c:283: error: unknown field 'stats' specified in initializer
net/sched/sch_red.c:283: warning: initialization makes integer from pointer without a cast
net/sched/sch_red.c: In function 'red_dump_stats':
net/sched/sch_red.c:352: error: unknown field 'xstats' specified in initializer
net/sched/sch_red.c:352: warning: initialization makes integer from pointer without a cast

Work around this.

Fixes: 602f3baf2218 ("net_sch: red: Add offload ability to RED qdisc")
Cc: Nogah Frankel <nogahf@mellanox.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Simon Horman <simon.horman@netronome.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>

diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index 007dd8ef8aacdfa7249422a91b74d2724a5c2c7a..7f8ea9e297c36acd0969b0330ab479e0199f47ac 100644 (file)
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -276,11 +276,13 @@ static int red_dump_offload(struct Qdisc *sch, struct tc_red_qopt *opt)
 {
        struct net_device *dev = qdisc_dev(sch);
        struct tc_red_qopt_offload hw_stats = {
+               .command = TC_RED_STATS,
                .handle = sch->handle,
                .parent = sch->parent,
-               .command = TC_RED_STATS,
-               .stats.bstats = &sch->bstats,
-               .stats.qstats = &sch->qstats,
+               {
+                       .stats.bstats = &sch->bstats,
+                       .stats.qstats = &sch->qstats,
+               },
        };
        int err;
 
@@ -346,10 +348,12 @@ static int red_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
        if (tc_can_offload(dev) &&  dev->netdev_ops->ndo_setup_tc) {
                struct red_stats hw_stats = {0};
                struct tc_red_qopt_offload hw_stats_request = {
+                       .command = TC_RED_XSTATS,
                        .handle = sch->handle,
                        .parent = sch->parent,
-                       .command = TC_RED_XSTATS,
-                       .xstats = &hw_stats,
+                       {
+                               .xstats = &hw_stats,
+                       },
                };
                if (!dev->netdev_ops->ndo_setup_tc(dev,
                                                   TC_SETUP_QDISC_RED,