aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@hp.com>2009-07-07 10:47:10 -0400
committerRusty Russell <rusty@rustcorp.com.au>2009-07-17 08:17:47 -0400
commite79f07e2925b10f09a2621650c16f3d6ea778747 (patch)
tree564b574f0e517c16a48ff2fb59d444b28543702e
parent4b892e6582e3a4fe01f623aea386907270d5bf83 (diff)
virtio_net: Sync header with qemu
Qemu added support for a few extra RX modes that Linux doesn't currently make use of. Sync the headers to maintain consistency. Signed-off-by: Alex Williamson <alex.williamson@hp.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--include/linux/virtio_net.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index cec79adbe3ea..9c543d6ac535 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -27,6 +27,7 @@
27#define VIRTIO_NET_F_CTRL_VQ 17 /* Control channel available */ 27#define VIRTIO_NET_F_CTRL_VQ 17 /* Control channel available */
28#define VIRTIO_NET_F_CTRL_RX 18 /* Control channel RX mode support */ 28#define VIRTIO_NET_F_CTRL_RX 18 /* Control channel RX mode support */
29#define VIRTIO_NET_F_CTRL_VLAN 19 /* Control channel VLAN filtering */ 29#define VIRTIO_NET_F_CTRL_VLAN 19 /* Control channel VLAN filtering */
30#define VIRTIO_NET_F_CTRL_RX_EXTRA 20 /* Extra RX mode control support */
30 31
31#define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ 32#define VIRTIO_NET_S_LINK_UP 1 /* Link is up */
32 33
@@ -81,14 +82,19 @@ typedef __u8 virtio_net_ctrl_ack;
81#define VIRTIO_NET_ERR 1 82#define VIRTIO_NET_ERR 1
82 83
83/* 84/*
84 * Control the RX mode, ie. promisucous and allmulti. PROMISC and 85 * Control the RX mode, ie. promisucous, allmulti, etc...
85 * ALLMULTI commands require an "out" sg entry containing a 1 byte 86 * All commands require an "out" sg entry containing a 1 byte
86 * state value, zero = disable, non-zero = enable. These commands 87 * state value, zero = disable, non-zero = enable. Commands
87 * are supported with the VIRTIO_NET_F_CTRL_RX feature. 88 * 0 and 1 are supported with the VIRTIO_NET_F_CTRL_RX feature.
89 * Commands 2-5 are added with VIRTIO_NET_F_CTRL_RX_EXTRA.
88 */ 90 */
89#define VIRTIO_NET_CTRL_RX 0 91#define VIRTIO_NET_CTRL_RX 0
90 #define VIRTIO_NET_CTRL_RX_PROMISC 0 92 #define VIRTIO_NET_CTRL_RX_PROMISC 0
91 #define VIRTIO_NET_CTRL_RX_ALLMULTI 1 93 #define VIRTIO_NET_CTRL_RX_ALLMULTI 1
94 #define VIRTIO_NET_CTRL_RX_ALLUNI 2
95 #define VIRTIO_NET_CTRL_RX_NOMULTI 3
96 #define VIRTIO_NET_CTRL_RX_NOUNI 4
97 #define VIRTIO_NET_CTRL_RX_NOBCAST 5
92 98
93/* 99/*
94 * Control the MAC filter table. 100 * Control the MAC filter table.