summary refs log tree commit diff stats
path: root/net/tap-linux.h
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-10-24 08:43:34 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2012-12-19 08:31:29 +0100
commit1422e32db51ff2b1194fb24a6201c4310be5667d (patch)
tree56f9911d524eca4194573a6037303a169e61db50 /net/tap-linux.h
parentfd9400b302ef582c3ae8a8d5288338ea5f0f4c9a (diff)
downloadfocaccia-qemu-1422e32db51ff2b1194fb24a6201c4310be5667d.tar.gz
focaccia-qemu-1422e32db51ff2b1194fb24a6201c4310be5667d.zip
net: reorganize headers
Move public headers to include/net, and leave private headers in net/.
Put the virtio headers in include/net/tap.h, removing the multiple copies
that existed.  Leave include/net/tap.h as the interface for NICs, and
net/tap_int.h as the interface for OS-specific parts of the tap backend.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'net/tap-linux.h')
-rw-r--r--net/tap-linux.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/net/tap-linux.h b/net/tap-linux.h
index 659e98122b..cb2a6d480a 100644
--- a/net/tap-linux.h
+++ b/net/tap-linux.h
@@ -13,8 +13,8 @@
  *  GNU General Public License for more details.
  */
 
-#ifndef QEMU_TAP_H
-#define QEMU_TAP_H
+#ifndef QEMU_TAP_LINUX_H
+#define QEMU_TAP_LINUX_H
 
 #include <stdint.h>
 #ifdef __linux__
@@ -44,20 +44,4 @@
 #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;
-};
-
-struct virtio_net_hdr_mrg_rxbuf
-{
-    struct virtio_net_hdr hdr;
-    uint16_t num_buffers;   /* Number of merged rx buffers */
-};
-
 #endif /* QEMU_TAP_H */