From: David S. Miller <davem@davemloft.net>
Date: Thu, 5 Jun 2014 23:22:02 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f666f87b9423fb534d2116206ace04495080f2b5;p=linux-beck.git

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

Conflicts:
	drivers/net/xen-netback/netback.c
	net/core/filter.c

A filter bug fix overlapped some cleanups and a conversion
over to some new insn generation macros.

A xen-netback bug fix overlapped the addition of multi-queue
support.

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

f666f87b9423fb534d2116206ace04495080f2b5
diff --cc drivers/net/xen-netback/netback.c
index 49efff9b99f4,a160b4ef5ba0..1844a47636b6
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -548,18 -556,12 +563,12 @@@ static void xenvif_add_frag_responses(s
  	}
  }
  
- struct xenvif_rx_cb {
- 	int meta_slots_used;
- };
- 
- #define XENVIF_RX_CB(skb) ((struct xenvif_rx_cb *)(skb)->cb)
- 
 -void xenvif_kick_thread(struct xenvif *vif)
 +void xenvif_kick_thread(struct xenvif_queue *queue)
  {
 -	wake_up(&vif->wq);
 +	wake_up(&queue->wq);
  }
  
 -static void xenvif_rx_action(struct xenvif *vif)
 +static void xenvif_rx_action(struct xenvif_queue *queue)
  {
  	s8 status;
  	u16 flags;
diff --cc net/core/filter.c
index 9de0c25323b4,ab3c74e49f07..6bd2e350e751
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@@ -684,7 -685,17 +688,11 @@@ static bool convert_bpf_extensions(stru
  		if (insn->off < 0)
  			return false;
  		insn++;
 -
 -		insn->code = BPF_ALU | BPF_AND | BPF_K;
 -		insn->a_reg = A_REG;
 -		insn->imm = PKT_TYPE_MAX;
 +		*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;
  
  	case SKF_AD_OFF + SKF_AD_IFINDEX: