virtio: do not enable/disable Rx modes unless supported
authorStephen Hemminger <shemming@brocade.com>
Thu, 11 Jun 2015 15:53:24 +0000 (08:53 -0700)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Fri, 12 Jun 2015 12:36:38 +0000 (14:36 +0200)
If negotiation with host says that controlling Rx mode is
not supported, then don't try.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Changchun Ouyang <changchun.ouyang@intel.com>
drivers/net/virtio/virtio_ethdev.c

index 57ae6c4..395df12 100644 (file)
@@ -426,6 +426,11 @@ virtio_dev_promiscuous_enable(struct rte_eth_dev *dev)
        int dlen[1];
        int ret;
 
+       if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX)) {
+               PMD_INIT_LOG(INFO, "host does not support rx control\n");
+               return;
+       }
+
        ctrl.hdr.class = VIRTIO_NET_CTRL_RX;
        ctrl.hdr.cmd = VIRTIO_NET_CTRL_RX_PROMISC;
        ctrl.data[0] = 1;
@@ -444,6 +449,11 @@ virtio_dev_promiscuous_disable(struct rte_eth_dev *dev)
        int dlen[1];
        int ret;
 
+       if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX)) {
+               PMD_INIT_LOG(INFO, "host does not support rx control\n");
+               return;
+       }
+
        ctrl.hdr.class = VIRTIO_NET_CTRL_RX;
        ctrl.hdr.cmd = VIRTIO_NET_CTRL_RX_PROMISC;
        ctrl.data[0] = 0;
@@ -462,6 +472,11 @@ virtio_dev_allmulticast_enable(struct rte_eth_dev *dev)
        int dlen[1];
        int ret;
 
+       if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX)) {
+               PMD_INIT_LOG(INFO, "host does not support rx control\n");
+               return;
+       }
+
        ctrl.hdr.class = VIRTIO_NET_CTRL_RX;
        ctrl.hdr.cmd = VIRTIO_NET_CTRL_RX_ALLMULTI;
        ctrl.data[0] = 1;
@@ -480,6 +495,11 @@ virtio_dev_allmulticast_disable(struct rte_eth_dev *dev)
        int dlen[1];
        int ret;
 
+       if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX)) {
+               PMD_INIT_LOG(INFO, "host does not support rx control\n");
+               return;
+       }
+
        ctrl.hdr.class = VIRTIO_NET_CTRL_RX;
        ctrl.hdr.cmd = VIRTIO_NET_CTRL_RX_ALLMULTI;
        ctrl.data[0] = 0;