diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-06-28 21:55:15 +0100 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-07-17 16:12:31 +0100 |
commit | f7cbb163d980fc79f47a3cba63dd130b1d655d1d (patch) | |
tree | 2e34cc08923e0e2c3324c422d8152cc54ed31e80 /drivers/net/ethernet/sfc | |
parent | e718905c4b02bfc650f383e02b643b7e60b9407e (diff) | |
download | linux-stable-f7cbb163d980fc79f47a3cba63dd130b1d655d1d.tar.gz linux-stable-f7cbb163d980fc79f47a3cba63dd130b1d655d1d.tar.bz2 linux-stable-f7cbb163d980fc79f47a3cba63dd130b1d655d1d.zip |
sfc: Stop changing header offsets on TX
There is nothing in the VLAN driver or core VLAN support that
invalidates the TCP and IP header offsets.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc')
-rw-r--r-- | drivers/net/ethernet/sfc/tx.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index cfa5f6db20bd..9b225a7769f7 100644 --- a/drivers/net/ethernet/sfc/tx.c +++ b/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)) { |