diff options
| author | Anthony Liguori | 2010-09-08 21:26:14 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2010-09-08 21:26:14 +0200 |
| commit | dccbe6fbab47c9a2589f436e0592933b47cbe40b (patch) | |
| tree | e5a851b48a3801dd28282eb17533975cade7ac23 /net/tap-linux.h | |
| parent | virtio-9p: Change handling of flags in open() path for 9P2000.L (diff) | |
| parent | virtio-net: Introduce a new bottom half packet TX (diff) | |
| download | qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.tar.gz qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.tar.xz qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.zip | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'net/tap-linux.h')
| -rw-r--r-- | net/tap-linux.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/tap-linux.h b/net/tap-linux.h index 9f943589bf..659e98122b 100644 --- a/net/tap-linux.h +++ b/net/tap-linux.h @@ -27,6 +27,8 @@ #define TUNSETOFFLOAD _IOW('T', 208, unsigned int) #define TUNGETIFF _IOR('T', 210, unsigned int) #define TUNSETSNDBUF _IOW('T', 212, int) +#define TUNGETVNETHDRSZ _IOR('T', 215, int) +#define TUNSETVNETHDRSZ _IOW('T', 216, int) #endif @@ -52,4 +54,10 @@ struct virtio_net_hdr 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 */ |