Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/core/rtnetlink.c
	net/core/skbuff.c

Both conflicts were very simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index c88cf147deed..892a102671ad 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -83,9 +83,9 @@ static void bpf_flush_icache(void *start_, void *end_)
 #define BNE             (F2(0, 2) | CONDNE)
 
 #ifdef CONFIG_SPARC64
-#define BNE_PTR         (F2(0, 1) | CONDNE | (2 << 20))
+#define BE_PTR          (F2(0, 1) | CONDE | (2 << 20))
 #else
-#define BNE_PTR         BNE
+#define BE_PTR          BE
 #endif
 
 #define SETHI(K, REG)   \
@@ -592,7 +592,7 @@ void bpf_jit_compile(struct sk_filter *fp)
                         case BPF_ANC | SKF_AD_IFINDEX:
                                 emit_skb_loadptr(dev, r_A);
                                 emit_cmpi(r_A, 0);
-                                emit_branch(BNE_PTR, cleanup_addr + 4);
+                                emit_branch(BE_PTR, cleanup_addr + 4);
                                 emit_nop();
                                 emit_load32(r_A, struct net_device, ifindex, r_A);
                                 break;
@@ -605,7 +605,7 @@ void bpf_jit_compile(struct sk_filter *fp)
                         case BPF_ANC | SKF_AD_HATYPE:
                                 emit_skb_loadptr(dev, r_A);
                                 emit_cmpi(r_A, 0);
-                                emit_branch(BNE_PTR, cleanup_addr + 4);
+                                emit_branch(BE_PTR, cleanup_addr + 4);
                                 emit_nop();
                                 emit_load16(r_A, struct net_device, type, r_A);
                                 break;