From patchwork Thu Oct 22 16:43:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [13/19] net: implement tap support for receive_raw() Date: Thu, 22 Oct 2009 06:43:44 -0000 From: Mark McLoughlin X-Patchwork-Id: 36706 Message-Id: <1256229830-28066-14-git-send-email-markmc@redhat.com> To: qemu-devel@nongnu.org Cc: Mark McLoughlin tap_receive_raw() always prepends a vnet header if IFF_VNET_HDR is enabled. tap_receive() only prepends when the a header is required but the NIC doesn't supply one. Signed-off-by: Mark McLoughlin --- net.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/net.c b/net.c index 56d9de7..b44495d 100644 --- a/net.c +++ b/net.c @@ -1377,14 +1377,14 @@ static ssize_t tap_receive_iov(VLANClientState *vc, const struct iovec *iov, return tap_write_packet(s, iovp, iovcnt); } -static ssize_t tap_receive(VLANClientState *vc, const uint8_t *buf, size_t size) +static ssize_t tap_receive_raw(VLANClientState *vc, const uint8_t *buf, size_t size) { TAPState *s = vc->opaque; struct iovec iov[2]; int iovcnt = 0; struct virtio_net_hdr hdr = { 0, }; - if (s->has_vnet_hdr && !s->using_vnet_hdr) { + if (s->has_vnet_hdr) { iov[iovcnt].iov_base = &hdr; iov[iovcnt].iov_len = sizeof(hdr); iovcnt++; @@ -1397,6 +1397,21 @@ static ssize_t tap_receive(VLANClientState *vc, const uint8_t *buf, size_t size) return tap_write_packet(s, iov, iovcnt); } +static ssize_t tap_receive(VLANClientState *vc, const uint8_t *buf, size_t size) +{ + TAPState *s = vc->opaque; + struct iovec iov[1]; + + if (s->has_vnet_hdr && !s->using_vnet_hdr) { + return tap_receive_raw(vc, buf, size); + } + + iov[0].iov_base = (char *)buf; + iov[0].iov_len = size; + + return tap_write_packet(s, iov, 1); +} + static int tap_can_send(void *opaque) { TAPState *s = opaque; @@ -1540,8 +1555,8 @@ static TAPState *net_tap_fd_init(VLANState *vlan, s->using_vnet_hdr = 0; s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_TAP, vlan, NULL, model, name, NULL, - tap_receive, NULL, tap_receive_iov, - tap_cleanup, s); + tap_receive, tap_receive_raw, + tap_receive_iov, tap_cleanup, s); tap_read_poll(s, 1); return s; }