From: Michael S. Tsirkin <mst@redhat.com>
Date: Mon, 24 Sep 2012 14:27:27 +0000 (+0200)
Subject: virtio-net: minor code simplification
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e043ebc6f9a093c1fd1b677191ad9fbeefe22d1e;p=qemu.git

virtio-net: minor code simplification

During packet filtering, we can now use host hdr len
to offset incoming buffer unconditionally.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index dc4a26cbd6..c94521e0fe 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -544,9 +544,7 @@ static int receive_filter(VirtIONet *n, const uint8_t *buf, int size)
     if (n->promisc)
         return 1;
 
-    if (n->has_vnet_hdr) {
-        ptr += sizeof(struct virtio_net_hdr);
-    }
+    ptr += n->host_hdr_len;
 
     if (!memcmp(&ptr[12], vlan, sizeof(vlan))) {
         int vid = be16_to_cpup((uint16_t *)(ptr + 14)) & 0xfff;