diff options
| author | Mike Rapoport <rppt@linux.vnet.ibm.com> | 2016-06-14 08:29:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-14 03:03:34 -0400 |
| commit | d1dc06dcd0f8fc559e449322d2fa4d769c289e00 (patch) | |
| tree | 0603a2abcac9c76214ff6b2e989e3e100773fe2b /drivers/net/virtio_net.c | |
| parent | 99860208bc62d8ebd5c57495b84856506fe075bc (diff) | |
| download | op-kernel-dev-d1dc06dcd0f8fc559e449322d2fa4d769c289e00.zip op-kernel-dev-d1dc06dcd0f8fc559e449322d2fa4d769c289e00.tar.gz | |
virtio_net: fix csum generation for virtio-net devices
The commit e858fae2b0b8 ("virtio_net: use common code for virtio_net_hdr
and skb GSO conversion") replaced the tun code for header manipulation
with the generic helpers. While doing so, it implictly moved the
skb_partial_csum_set() invocation after eth_type_trans(), which
invalidate the current gso start/offset values.
Fix it by moving the helper invocation before the mac pulling.
Fixes: e858fae2b0b8 ("virtio_net: use common code for virtio_net_hdr and
skb GSO conversion")
Reported-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index f9470f2..1dd08d4 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -482,10 +482,6 @@ static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq, if (hdr->hdr.flags & VIRTIO_NET_HDR_F_DATA_VALID) skb->ip_summed = CHECKSUM_UNNECESSARY; - 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 (virtio_net_hdr_to_skb(skb, &hdr->hdr, virtio_is_little_endian(vi->vdev))) { net_warn_ratelimited("%s: bad gso: type: %u, size: %u\n", @@ -494,6 +490,10 @@ static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq, 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); + napi_gro_receive(&rq->napi, skb); return; |
