linux-next: build failure after merge of the net-next tree

Hi all,

After merging the net-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

net/core/filter.c: In function 'convert_bpf_extensions':
net/core/filter.c:696:17: error: 'A_REG' undeclared (first use in this function)
   insn->a_reg = A_REG;
                 ^

Caused by my bad merge resolution :-(

I applied this in the hope that it is correct (at least it builds):

From: Stephen Rothwell <redacted>
Date: Fri, 6 Jun 2014 14:00:07 +1000
Subject: [PATCH] net: filter: merge fix up

Signed-off-by: Stephen Rothwell <redacted>
---
 net/core/filter.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index 7b46e4553c17..74dd87596257 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c

@@ -691,10 +691,7 @@ static bool convert_bpf_extensions(struct sock_filter *fp,
 		*insn = BPF_ALU32_IMM(BPF_AND, BPF_REG_A, PKT_TYPE_MAX);
 #ifdef __BIG_ENDIAN_BITFIELD
 		insn++;
-
-		insn->code = BPF_ALU | BPF_RSH | BPF_K;
-		insn->a_reg = A_REG;
-		insn->imm = 5;
+		*insn = BPF_ALU32_IMM(BPF_RSH, BPF_REG_A, 5);
 #endif
 		break;
 

-- 
2.0.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au