From patchwork Tue May 5 08:56:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 21837 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n458uV51030512 for ; Tue, 5 May 2009 08:56:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753234AbZEEI42 (ORCPT ); Tue, 5 May 2009 04:56:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752159AbZEEI42 (ORCPT ); Tue, 5 May 2009 04:56:28 -0400 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 Received: (qmail 71910 messnum 1803415 invoked from network[83.70.64.178/83-70-64-178-dynamic.b-ras1.srl.dublin.eircom.net]); 5 May 2009 08:56:26 -0000 Received: from 83-70-64-178-dynamic.b-ras1.srl.dublin.eircom.net (HELO blaa.localdomain) (83.70.64.178) by mail12.svc.cra.dublin.eircom.net (qp 71910) with SMTP; 5 May 2009 08:56:26 -0000 Received: by blaa.localdomain (Postfix, from userid 500) id 57233881A2; Tue, 5 May 2009 09:56:25 +0100 (IST) From: Mark McLoughlin To: avi@redhat.com Cc: kvm@vger.kernel.org, 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> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241459088.26045.1.camel@lappy> References: <1241459088.26045.1.camel@lappy> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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))))