---

yaml
---
r: 315443
b: refs/heads/master
c: f7cbb16
h: refs/heads/master
i:
  315441: 9d5d7e5
  315439: 9048ec6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e718905c4b02bfc650f383e02b643b7e60b9407e
+refs/heads/master: f7cbb163d980fc79f47a3cba63dd130b1d655d1d

trunk/drivers/net/ethernet/sfc/tx.c

@@ -651,17 +651,8 @@ static __be16 efx_tso_check_protocol(struct sk_buff *skb)
 	EFX_BUG_ON_PARANOID(((struct ethhdr *)skb->data)->h_proto !=
 			    protocol);
 	if (protocol == htons(ETH_P_8021Q)) {
-		/* Find the encapsulated protocol; reset network header
-		 * and transport header based on that. */
 		struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
 		protocol = veh->h_vlan_encapsulated_proto;
-		skb_set_network_header(skb, sizeof(*veh));
-		if (protocol == htons(ETH_P_IP))
-			skb_set_transport_header(skb, sizeof(*veh) +
-						 4 * ip_hdr(skb)->ihl);
-		else if (protocol == htons(ETH_P_IPV6))
-			skb_set_transport_header(skb, sizeof(*veh) +
-						 sizeof(struct ipv6hdr));
 	}
 
 	if (protocol == htons(ETH_P_IP)) {