From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark McLoughlin Subject: [PATCH 1/1] qemu-kvm: virtio-net: Re-instate GSO code removed upstream Date: Tue, 5 May 2009 09:56:25 +0100 Message-ID: <1241513785-28738-1-git-send-email-markmc@redhat.com> References: <1241459088.26045.1.camel@lappy> Cc: kvm@vger.kernel.org, Mark McLoughlin To: avi@redhat.com Return-path: Received: from mail12.svc.cra.dublin.eircom.net ([159.134.118.28]:44616 "HELO mail12.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751970AbZEEI41 (ORCPT ); Tue, 5 May 2009 04:56:27 -0400 In-Reply-To: <1241459088.26045.1.camel@lappy> Sender: kvm-owner@vger.kernel.org List-ID: This commit: commit 559a8f45f34cc50d1a60b4f67a06614d506b2e01 Subject: Remove stray GSO code from virtio_net (Mark McLoughlin) Removed some GSO code from upstream qemu.git, but it needs to be re-instated in qemu-kvm.git. Reported-by: Sridhar Samudrala Signed-off-by: Mark McLoughlin --- hw/virtio-net.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index ac8e030..e5d7add 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -424,6 +424,11 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size) if (n->promisc) return 1; +#ifdef TAP_VNET_HDR + if (tap_has_vnet_hdr(n->vc->vlan->first_client)) + ptr += sizeof(struct virtio_net_hdr); +#endif + if (!memcmp(&ptr[12], vlan, sizeof(vlan))) { int vid = be16_to_cpup((uint16_t *)(ptr + 14)) & 0xfff; if (!(n->vlans[vid >> 5] & (1U << (vid & 0x1f)))) -- 1.6.0.6