From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Mar 2013 00:42:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'net-next/master'
X-Git-Tag: next-20130320~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ecf85f6115ef449b39d414fc721f2d55ac3e235c;p=karo-tx-linux.git

Merge remote-tracking branch 'net-next/master'
---

ecf85f6115ef449b39d414fc721f2d55ac3e235c
diff --cc net/core/dev.c
index d540ced1f6c6,8c47ab243926..de930b751712
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2208,20 -2208,12 +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)))