OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio-net: rename ctrl rx commands 

This patch makes rx commands consistent with specification.

Signed-off-by: Amos Kong <akong@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Amos Kong 2013-01-22 23:44:46 +08:00 committed by Michael S. Tsirkin
parent c1943a3f37
commit dd23454ba2
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/virtio-net.c
View File

@ -327,17 +327,17 @@ static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd,
return VIRTIO_NET_ERR; return VIRTIO_NET_ERR;
} }
if (cmd == VIRTIO_NET_CTRL_RX_MODE_PROMISC) { if (cmd == VIRTIO_NET_CTRL_RX_PROMISC) {
n->promisc = on; n->promisc = on;
} else if (cmd == VIRTIO_NET_CTRL_RX_MODE_ALLMULTI) { } else if (cmd == VIRTIO_NET_CTRL_RX_ALLMULTI) {
n->allmulti = on; n->allmulti = on;
} else if (cmd == VIRTIO_NET_CTRL_RX_MODE_ALLUNI) { } else if (cmd == VIRTIO_NET_CTRL_RX_ALLUNI) {
n->alluni = on; n->alluni = on;
} else if (cmd == VIRTIO_NET_CTRL_RX_MODE_NOMULTI) { } else if (cmd == VIRTIO_NET_CTRL_RX_NOMULTI) {
n->nomulti = on; n->nomulti = on;
} else if (cmd == VIRTIO_NET_CTRL_RX_MODE_NOUNI) { } else if (cmd == VIRTIO_NET_CTRL_RX_NOUNI) {
n->nouni = on; n->nouni = on;
} else if (cmd == VIRTIO_NET_CTRL_RX_MODE_NOBCAST) { } else if (cmd == VIRTIO_NET_CTRL_RX_NOBCAST) {
n->nobcast = on; n->nobcast = on;
} else { } else {
return VIRTIO_NET_ERR; return VIRTIO_NET_ERR;
@ -474,7 +474,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
iov_discard_front(&iov, &iov_cnt, sizeof(ctrl)); iov_discard_front(&iov, &iov_cnt, sizeof(ctrl));
if (s != sizeof(ctrl)) { if (s != sizeof(ctrl)) {
status = VIRTIO_NET_ERR; status = VIRTIO_NET_ERR;
} else if (ctrl.class == VIRTIO_NET_CTRL_RX_MODE) { } else if (ctrl.class == VIRTIO_NET_CTRL_RX) {
status = virtio_net_handle_rx_mode(n, ctrl.cmd, iov, iov_cnt); status = virtio_net_handle_rx_mode(n, ctrl.cmd, iov, iov_cnt);
} else if (ctrl.class == VIRTIO_NET_CTRL_MAC) { } else if (ctrl.class == VIRTIO_NET_CTRL_MAC) {
status = virtio_net_handle_mac(n, ctrl.cmd, iov, iov_cnt); status = virtio_net_handle_mac(n, ctrl.cmd, iov, iov_cnt);

14
hw/virtio-net.h
View File

@ -99,13 +99,13 @@ typedef uint8_t virtio_net_ctrl_ack;
* 0 and 1 are supported with the VIRTIO_NET_F_CTRL_RX feature. * 0 and 1 are supported with the VIRTIO_NET_F_CTRL_RX feature.
* Commands 2-5 are added with VIRTIO_NET_F_CTRL_RX_EXTRA. * Commands 2-5 are added with VIRTIO_NET_F_CTRL_RX_EXTRA.
*/ */
#define VIRTIO_NET_CTRL_RX_MODE 0 #define VIRTIO_NET_CTRL_RX 0
#define VIRTIO_NET_CTRL_RX_MODE_PROMISC 0 #define VIRTIO_NET_CTRL_RX_PROMISC 0
#define VIRTIO_NET_CTRL_RX_MODE_ALLMULTI 1 #define VIRTIO_NET_CTRL_RX_ALLMULTI 1
#define VIRTIO_NET_CTRL_RX_MODE_ALLUNI 2 #define VIRTIO_NET_CTRL_RX_ALLUNI 2
#define VIRTIO_NET_CTRL_RX_MODE_NOMULTI 3 #define VIRTIO_NET_CTRL_RX_NOMULTI 3
#define VIRTIO_NET_CTRL_RX_MODE_NOUNI 4 #define VIRTIO_NET_CTRL_RX_NOUNI 4
#define VIRTIO_NET_CTRL_RX_MODE_NOBCAST 5 #define VIRTIO_NET_CTRL_RX_NOBCAST 5
/* /*
* Control the MAC * Control the MAC