net: add rte prefix to ether structures

[dpdk.git] / drivers / net / failsafe / failsafe_ops.c

diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index e3add40..c900ecc 100644 (file)
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -452,7 +452,7 @@ fs_rx_queue_release(void *queue)
        if (queue == NULL)
                return;
        rxq = queue;
-       dev = rxq->priv->dev;
+       dev = &rte_eth_devices[rxq->priv->data->port_id];
        fs_lock(dev, 0);
        if (rxq->event_fd > 0)
                close(rxq->event_fd);
@@ -636,7 +636,7 @@ fs_tx_queue_release(void *queue)
        if (queue == NULL)
                return;
        txq = queue;
-       dev = txq->priv->dev;
+       dev = &rte_eth_devices[txq->priv->data->port_id];
        fs_lock(dev, 0);
        FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
                if (ETH(sdev)->data->tx_queues != NULL &&
@@ -1082,7 +1082,7 @@ fs_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
 
 static int
 fs_mac_addr_add(struct rte_eth_dev *dev,
-               struct ether_addr *mac_addr,
+               struct rte_ether_addr *mac_addr,
                uint32_t index,
                uint32_t vmdq)
 {
@@ -1111,7 +1111,7 @@ fs_mac_addr_add(struct rte_eth_dev *dev,
 }
 
 static int
-fs_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+fs_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
        struct sub_device *sdev;
        uint8_t i;
@@ -1135,7 +1135,7 @@ fs_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
 
 static int
 fs_set_mc_addr_list(struct rte_eth_dev *dev,
-                   struct ether_addr *mc_addr_set, uint32_t nb_mc_addr)
+                   struct rte_ether_addr *mc_addr_set, uint32_t nb_mc_addr)
 {
        struct sub_device *sdev;
        uint8_t i;
@@ -1208,33 +1208,17 @@ fs_rss_hash_update(struct rte_eth_dev *dev,
 }
 
 static int
-fs_filter_ctrl(struct rte_eth_dev *dev,
+fs_filter_ctrl(struct rte_eth_dev *dev __rte_unused,
                enum rte_filter_type type,
                enum rte_filter_op op,
                void *arg)
 {
-       struct sub_device *sdev;
-       uint8_t i;
-       int ret;
-
        if (type == RTE_ETH_FILTER_GENERIC &&
            op == RTE_ETH_FILTER_GET) {
                *(const void **)arg = &fs_flow_ops;
                return 0;
        }
-       fs_lock(dev, 0);
-       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
-               DEBUG("Calling rte_eth_dev_filter_ctrl on sub_device %d", i);
-               ret = rte_eth_dev_filter_ctrl(PORT_ID(sdev), type, op, arg);
-               if ((ret = fs_err(sdev, ret))) {
-                       ERROR("Operation rte_eth_dev_filter_ctrl failed for sub_device %d"
-                             " with error %d", i, ret);
-                       fs_unlock(dev, 0);
-                       return ret;
-               }
-       }
-       fs_unlock(dev, 0);
-       return 0;
+       return -ENOTSUP;
 }
 
 const struct eth_dev_ops failsafe_ops = {