From: David S. Miller <davem@davemloft.net>
Date: Wed, 20 Mar 2013 16:46:26 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=61816596d1c9026d0ecb20c44f90452c41596ffe;p=~shefty%2Frdma-dev.git

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

Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.

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

61816596d1c9026d0ecb20c44f90452c41596ffe
diff --cc net/core/dev.c
index 8c47ab24392,d540ced1f6c..de930b75171
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2208,12 -2208,20 +2208,12 @@@ out
  }
  EXPORT_SYMBOL(skb_checksum_help);
  
 -/**
 - *	skb_mac_gso_segment - mac layer segmentation handler.
 - *	@skb: buffer to segment
 - *	@features: features for the output path (see dev->features)
 - */
 -struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
 -				    netdev_features_t features)
 +__be16 skb_network_protocol(struct sk_buff *skb)
  {
 -	struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
 -	struct packet_offload *ptype;
  	__be16 type = skb->protocol;
+ 	int vlan_depth = ETH_HLEN;
  
  	while (type == htons(ETH_P_8021Q)) {
- 		int vlan_depth = ETH_HLEN;
  		struct vlan_hdr *vh;
  
  		if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN)))