From patchwork Thu Oct 22 16:49:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 36722 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 51C34B7B9F for ; Fri, 23 Oct 2009 04:44:45 +1100 (EST) Received: from localhost ([127.0.0.1]:35144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N11iM-0000Ov-5M for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2009 13:44:42 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N10so-0006MK-L3 for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:26 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N10sc-00068O-M5 for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:20 -0400 Received: from [199.232.76.173] (port=54111 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N10sa-00066w-Rf for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62163) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N10sZ-00042W-S5 for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:12 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9MGpAc7017905 for ; Thu, 22 Oct 2009 12:51:10 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9MGp9wZ021035; Thu, 22 Oct 2009 12:51:10 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id 1D11045B4B; Thu, 22 Oct 2009 17:49:17 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 22 Oct 2009 17:49:06 +0100 Message-Id: <1256230156-29652-6-git-send-email-markmc@redhat.com> In-Reply-To: <1256230156-29652-1-git-send-email-markmc@redhat.com> References: <1256230156-29652-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 05/15] net: move tap-linux.h under net/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Mark McLoughlin --- net.c | 2 +- net/tap-linux.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ tap-linux.h | 51 --------------------------------------------------- 3 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 net/tap-linux.h delete mode 100644 tap-linux.h diff --git a/net.c b/net.c index 2f31562..3225dcd 100644 --- a/net.c +++ b/net.c @@ -46,7 +46,7 @@ #include #endif #ifdef __linux__ -#include "tap-linux.h" +#include "net/tap-linux.h" #endif #include #include diff --git a/net/tap-linux.h b/net/tap-linux.h new file mode 100644 index 0000000..d81c650 --- /dev/null +++ b/net/tap-linux.h @@ -0,0 +1,51 @@ +/* + * Universal TUN/TAP device driver. + * Copyright (C) 1999-2000 Maxim Krasnyansky + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef QEMU_TAP_H +#define QEMU_TAP_H + +#include +#include + +/* Ioctl defines */ +#define TUNSETIFF _IOW('T', 202, int) +#define TUNGETFEATURES _IOR('T', 207, unsigned int) +#define TUNSETOFFLOAD _IOW('T', 208, unsigned int) +#define TUNGETIFF _IOR('T', 210, unsigned int) +#define TUNSETSNDBUF _IOW('T', 212, int) + +/* TUNSETIFF ifr flags */ +#define IFF_TAP 0x0002 +#define IFF_NO_PI 0x1000 +#define IFF_VNET_HDR 0x4000 + +/* Features for GSO (TUNSETOFFLOAD). */ +#define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */ +#define TUN_F_TSO4 0x02 /* I can handle TSO for IPv4 packets */ +#define TUN_F_TSO6 0x04 /* I can handle TSO for IPv6 packets */ +#define TUN_F_TSO_ECN 0x08 /* I can handle TSO with ECN bits. */ +#define TUN_F_UFO 0x10 /* I can handle UFO packets */ + +struct virtio_net_hdr +{ + uint8_t flags; + uint8_t gso_type; + uint16_t hdr_len; + uint16_t gso_size; + uint16_t csum_start; + uint16_t csum_offset; +}; + +#endif /* QEMU_TAP_H */ diff --git a/tap-linux.h b/tap-linux.h deleted file mode 100644 index d81c650..0000000 --- a/tap-linux.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Universal TUN/TAP device driver. - * Copyright (C) 1999-2000 Maxim Krasnyansky - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef QEMU_TAP_H -#define QEMU_TAP_H - -#include -#include - -/* Ioctl defines */ -#define TUNSETIFF _IOW('T', 202, int) -#define TUNGETFEATURES _IOR('T', 207, unsigned int) -#define TUNSETOFFLOAD _IOW('T', 208, unsigned int) -#define TUNGETIFF _IOR('T', 210, unsigned int) -#define TUNSETSNDBUF _IOW('T', 212, int) - -/* TUNSETIFF ifr flags */ -#define IFF_TAP 0x0002 -#define IFF_NO_PI 0x1000 -#define IFF_VNET_HDR 0x4000 - -/* Features for GSO (TUNSETOFFLOAD). */ -#define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */ -#define TUN_F_TSO4 0x02 /* I can handle TSO for IPv4 packets */ -#define TUN_F_TSO6 0x04 /* I can handle TSO for IPv6 packets */ -#define TUN_F_TSO_ECN 0x08 /* I can handle TSO with ECN bits. */ -#define TUN_F_UFO 0x10 /* I can handle UFO packets */ - -struct virtio_net_hdr -{ - uint8_t flags; - uint8_t gso_type; - uint16_t hdr_len; - uint16_t gso_size; - uint16_t csum_start; - uint16_t csum_offset; -}; - -#endif /* QEMU_TAP_H */