From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org, Jason Wang <jasowang@redhat.com>,
Anthony Liguori <anthony@codemonkey.ws>,
stefanha@linux.vnet.ibm.com, aurelien@aurel32.net
Subject: [Qemu-devel] [PATCHv2 12/14] virtio-net: minor code simplification
Date: Tue, 25 Sep 2012 13:12:53 +0200 [thread overview]
Message-ID: <4a8a287e04536124e633b595ae6faca3ae4c8a1a.1348571185.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1348571185.git.mst@redhat.com>
During packet filtering, we can now use host hdr len
to offset incoming buffer unconditionally.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio-net.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index ef7f399..8ecc07b 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;
--
MST
next prev parent reply other threads:[~2012-09-25 11:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 11:12 [Qemu-devel] [PATCHv2 00/14] virtio-net: iovec handling cleanup Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 01/14] virtio-net: track host/guest header length Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 02/14] iov: add const annotation Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 03/14] iov: add iov_cpy Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 04/14] virtio-net: avoid sg copy Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 05/14] virtio-net: use safe iov operations for rx Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 06/14] virtio-net: refactor receive_hdr Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 07/14] virtio-net: first s/g is always at start of buf Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 08/14] virtio-net: switch tx to safe iov functions Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 09/14] virtio-net: simplify rx code Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 10/14] virtio: don't mark unaccessed memory as dirty Michael S. Tsirkin
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 11/14] virtio-net: fix used len for tx Michael S. Tsirkin
2012-09-25 11:12 ` Michael S. Tsirkin [this message]
2012-09-25 11:12 ` [Qemu-devel] [PATCHv2 13/14] virtio-net: test peer header support at init time Michael S. Tsirkin
2012-09-25 11:13 ` [Qemu-devel] [PATCHv2 14/14] virtio-net: enable mrg buf header in tap on linux Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4a8a287e04536124e633b595ae6faca3ae4c8a1a.1348571185.git.mst@redhat.com \
--to=mst@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=aurelien@aurel32.net \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).