diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2008-06-08 20:49:00 +1000 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-10 18:20:29 -0400 |
| commit | 23cde76d801246a702e7a84c3fe3d655b35c89a1 (patch) | |
| tree | 532e7c5b8b4e47599bf93af1b4e618fa5891b5d9 | |
| parent | 00aaea2f95d73d4e2b5e45cf77c3cbb16c59e87f (diff) | |
| download | linux-3.10-23cde76d801246a702e7a84c3fe3d655b35c89a1.tar.gz linux-3.10-23cde76d801246a702e7a84c3fe3d655b35c89a1.tar.bz2 linux-3.10-23cde76d801246a702e7a84c3fe3d655b35c89a1.zip | |
virtio_net: Fix skb->csum_start computation
hdr->csum_start is the offset from the start of the ethernet
header to the transport layer checksum field. skb->csum_start
is the offset from skb->head.
skb_partial_csum_set() assumes that skb->data points to the
ethernet header - i.e. it computes skb->csum_start by adding
the headroom to hdr->csum_start.
Since eth_type_trans() skb_pull()s the ethernet header,
skb_partial_csum_set() should be called before
eth_type_trans().
(Without this patch, GSO packets from a guest to the world outside the
host are corrupted).
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| -rw-r--r-- | drivers/net/virtio_net.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 5450eac9e26..9a3b85e55cc 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -94,9 +94,7 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, BUG_ON(len > MAX_PACKET_LEN); skb_trim(skb, len); - skb->protocol = eth_type_trans(skb, dev); - pr_debug("Receiving skb proto 0x%04x len %i type %i\n", - ntohs(skb->protocol), skb->len, skb->pkt_type); + dev->stats.rx_bytes += skb->len; dev->stats.rx_packets++; @@ -106,6 +104,10 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, goto frame_err; } + skb->protocol = eth_type_trans(skb, dev); + pr_debug("Receiving skb proto 0x%04x len %i type %i\n", + ntohs(skb->protocol), skb->len, skb->pkt_type); + if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) { pr_debug("GSO!\n"); switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) { |