[Qemu-devel] [PATCH 05/15] net: move tap-linux.h under net/

[Mark McLoughlin]

Signed-off-by: Mark McLoughlin <address@hidden>
---
 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 <net/if_tap.h>
 #endif
 #ifdef __linux__
-#include "tap-linux.h"
+#include "net/tap-linux.h"
 #endif
 #include <arpa/inet.h>
 #include <dirent.h>
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 <address@hidden>
+ *
+ *  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 <stdint.h>
+#include <linux/ioctl.h>
+
+/* 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 <address@hidden>
- *
- *  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 <stdint.h>
-#include <linux/ioctl.h>
-
-/* 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 */
-- 
1.6.2.5