lib/test_bpf.c: don't use gcc union shortcut

Older gcc's (mine is gcc-4.4.4) make a mess of this.

lib/test_bpf.c:74: error: unknown field 'insns' specified in initializer
lib/test_bpf.c:75: warning: missing braces around initializer
lib/test_bpf.c:75: warning: (near initialization for 'tests[0].<anonymous>.insns[0]')
lib/test_bpf.c:76: error: extra brace group at end of initializer
lib/test_bpf.c:76: error: (near initialization for 'tests[0].<anonymous>')
lib/test_bpf.c:76: warning: excess elements in union initializer
lib/test_bpf.c:76: warning: (near initialization for 'tests[0].<anonymous>')
lib/test_bpf.c:77: error: extra brace group at end of initializer

Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 52 insertions, 52 deletions

diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index e160934430eb..3d80adbdb559 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -54,7 +54,7 @@ struct bpf_test {
         union {
                 struct sock_filter insns[MAX_INSNS];
                 struct sock_filter_int insns_int[MAX_INSNS];
-        };
+        } u;
         enum {
                 NO_DATA,
                 EXPECTED_FAIL,
@@ -71,7 +71,7 @@ struct bpf_test {
 static struct bpf_test tests[] = {
         {
                 "TAX",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_IMM, 1),
                         BPF_STMT(BPF_MISC | BPF_TAX, 0),
                         BPF_STMT(BPF_LD | BPF_IMM, 2),
@@ -90,7 +90,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "TXA",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LDX | BPF_LEN, 0),
                         BPF_STMT(BPF_MISC | BPF_TXA, 0),
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_X, 0),
@@ -102,7 +102,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "ADD_SUB_MUL_K",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_IMM, 1),
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_K, 2),
                         BPF_STMT(BPF_LDX | BPF_IMM, 3),
@@ -117,7 +117,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "DIV_KX",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_IMM, 8),
                         BPF_STMT(BPF_ALU | BPF_DIV | BPF_K, 2),
                         BPF_STMT(BPF_MISC | BPF_TAX, 0),
@@ -135,7 +135,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "AND_OR_LSH_K",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_IMM, 0xff),
                         BPF_STMT(BPF_ALU | BPF_AND | BPF_K, 0xf0),
                         BPF_STMT(BPF_ALU | BPF_LSH | BPF_K, 27),
@@ -151,7 +151,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_IND",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LDX | BPF_LEN, 0),
                         BPF_STMT(BPF_LD | BPF_H | BPF_IND, MAX_K),
                         BPF_STMT(BPF_RET | BPF_K, 1)
@@ -162,7 +162,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_ABS",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_W | BPF_ABS, 1000),
                         BPF_STMT(BPF_RET | BPF_K, 1)
                 },
@@ -172,7 +172,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_ABS_LL",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_B | BPF_ABS, SKF_LL_OFF),
                         BPF_STMT(BPF_MISC | BPF_TAX, 0),
                         BPF_STMT(BPF_LD | BPF_B | BPF_ABS, SKF_LL_OFF + 1),
@@ -185,7 +185,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_IND_LL",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_IMM, SKF_LL_OFF - 1),
                         BPF_STMT(BPF_LDX | BPF_LEN, 0),
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_X, 0),
@@ -199,7 +199,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_ABS_NET",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_B | BPF_ABS, SKF_NET_OFF),
                         BPF_STMT(BPF_MISC | BPF_TAX, 0),
                         BPF_STMT(BPF_LD | BPF_B | BPF_ABS, SKF_NET_OFF + 1),
@@ -212,7 +212,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_IND_NET",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_IMM, SKF_NET_OFF - 15),
                         BPF_STMT(BPF_LDX | BPF_LEN, 0),
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_X, 0),
@@ -226,7 +226,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_PKTTYPE",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                  SKF_AD_OFF + SKF_AD_PKTTYPE),
                         BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, SKB_TYPE, 1, 0),
@@ -247,7 +247,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_MARK",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                  SKF_AD_OFF + SKF_AD_MARK),
                         BPF_STMT(BPF_RET | BPF_A, 0)
@@ -258,7 +258,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_RXHASH",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                  SKF_AD_OFF + SKF_AD_RXHASH),
                         BPF_STMT(BPF_RET | BPF_A, 0)
@@ -269,7 +269,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_QUEUE",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                  SKF_AD_OFF + SKF_AD_QUEUE),
                         BPF_STMT(BPF_RET | BPF_A, 0)
@@ -280,7 +280,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_PROTOCOL",
-                .insns = {
+                .u.insns = {
                         BPF_STMT(BPF_LD | BPF_B | BPF_ABS, 1),
                         BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, 20, 1, 0),
                         BPF_STMT(BPF_RET | BPF_K, 0),
@@ -299,7 +299,7 @@ static struct bpf_test tests[] = {
         },
         {
                 "LD_VLAN_TAG",
-                .insns = {
+                .u.insns = {