summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHerbert Xu2009-06-04 02:59:18 +0200
committerDavid S. Miller2009-06-08 09:19:11 +0200
commitb82f08ea162edeee6c2c70c6c4321bea4763fa35 (patch)
treec8f18af83b66604eeac54884871c7ffe91b37d46 /drivers
parentsis190: fix gigabit negotiation (diff)
downloadkernel-qcow2-linux-b82f08ea162edeee6c2c70c6c4321bea4763fa35.tar.gz
kernel-qcow2-linux-b82f08ea162edeee6c2c70c6c4321bea4763fa35.tar.xz
kernel-qcow2-linux-b82f08ea162edeee6c2c70c6c4321bea4763fa35.zip
virtio_net: Set correct gso->hdr_len
Through a bug in the tun driver, I noticed that virtio_net is producing bogus hdr_len values. In particular, it only includes the IP header in the linear area, and excludes the entire TCP header. This causes the TCP header to be copied twice for each packet. (The bug omitted the second copy :) This patch corrects this. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/virtio_net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 0c9ca67f66e6..09bd4410fa65 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -470,7 +470,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
}
if (skb_is_gso(skb)) {
- hdr->hdr_len = skb_transport_header(skb) - skb->data;
+ hdr->hdr_len = skb_headlen(skb);
hdr->gso_size = skb_shinfo(skb)->gso_size;
if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;