From 5fd819f1b539660eff1bd02d64e5d06206f94533 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 28 Jun 2012 21:55:15 +0100 Subject: [PATCH] --- yaml --- r: 315443 b: refs/heads/master c: f7cbb163d980fc79f47a3cba63dd130b1d655d1d h: refs/heads/master i: 315441: 9d5d7e5e30c623dbe7ebaf1312a196a59d699f98 315439: 9048ec6cfe9d8712ce549e04e586abbe96ea4c4c v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/tx.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 57d37e53f62e..ecb8000913fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e718905c4b02bfc650f383e02b643b7e60b9407e +refs/heads/master: f7cbb163d980fc79f47a3cba63dd130b1d655d1d diff --git a/trunk/drivers/net/ethernet/sfc/tx.c b/trunk/drivers/net/ethernet/sfc/tx.c index cfa5f6db20bd..9b225a7769f7 100644 --- a/trunk/drivers/net/ethernet/sfc/tx.c +++ b/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)) {