From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LusSI-0005ch-JA
	for qemu-devel@nongnu.org; Fri, 17 Apr 2009 14:06:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LusSH-0005cV-OA
	for qemu-devel@nongnu.org; Fri, 17 Apr 2009 14:06:26 -0400
Received: from [199.232.76.173] (port=60726 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LusSH-0005cS-JM
	for qemu-devel@nongnu.org; Fri, 17 Apr 2009 14:06:25 -0400
Received: from savannah.gnu.org ([199.232.41.3]:34148 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LusSH-0002eR-6k
	for qemu-devel@nongnu.org; Fri, 17 Apr 2009 14:06:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LusSG-0004DC-NX
	for qemu-devel@nongnu.org; Fri, 17 Apr 2009 18:06:24 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LusSG-0004D7-Fl
	for qemu-devel@nongnu.org; Fri, 17 Apr 2009 18:06:24 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LusSG-0004D7-Fl@cvs.savannah.gnu.org>
Date: Fri, 17 Apr 2009 18:06:24 +0000
Subject: [Qemu-devel] [7152] Remove stray GSO code from virtio_net (Mark
	McLoughlin)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 7152
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7152
Author:   aliguori
Date:     2009-04-17 18:06:24 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
Remove stray GSO code from virtio_net (Mark McLoughlin)

Obviously merged from kvm-userspace accidentally.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    branches/stable_0_10/hw/virtio-net.c

Modified: branches/stable_0_10/hw/virtio-net.c
===================================================================
--- branches/stable_0_10/hw/virtio-net.c	2009-04-17 17:11:12 UTC (rev 7151)
+++ branches/stable_0_10/hw/virtio-net.c	2009-04-17 18:06:24 UTC (rev 7152)
@@ -338,11 +338,6 @@
     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))))