net: add rte prefix to ether functions

[dpdk.git] / drivers / net / mlx5 / mlx5_mac.c

diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index 0fb4a3e..9204c5f 100644 (file)
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -57,35 +57,30 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[ETHER_ADDR_LEN])
 }
 
 /**
- * DPDK callback to remove a MAC address.
+ * Remove a MAC address from the internal array.
  *
  * @param dev
  *   Pointer to Ethernet device structure.
  * @param index
  *   MAC address index.
  */
-void
-mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
+static void
+mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        const int vf = priv->config.vf;
-       int ret;
 
        assert(index < MLX5_MAX_MAC_ADDRESSES);
+       if (rte_is_zero_ether_addr(&dev->data->mac_addrs[index]))
+               return;
        if (vf)
                mlx5_nl_mac_addr_remove(dev, &dev->data->mac_addrs[index],
                                        index);
-       memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr));
-       if (!dev->data->promiscuous) {
-               ret = mlx5_traffic_restart(dev);
-               if (ret)
-                       DRV_LOG(ERR, "port %u cannot restart traffic: %s",
-                               dev->data->port_id, strerror(rte_errno));
-       }
+       memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr));
 }
 
 /**
- * DPDK callback to add a MAC address.
+ * Adds a MAC address to the internal array.
  *
  * @param dev
  *   Pointer to Ethernet device structure.
@@ -93,21 +88,23 @@ mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
  *   MAC address to register.
  * @param index
  *   MAC address index.
- * @param vmdq
- *   VMDq pool index to associate address with (ignored).
  *
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-int
-mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
-                 uint32_t index, uint32_t vmdq __rte_unused)
+static int
+mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
+                          uint32_t index)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        const int vf = priv->config.vf;
        unsigned int i;
 
        assert(index < MLX5_MAX_MAC_ADDRESSES);
+       if (rte_is_zero_ether_addr(mac)) {
+               rte_errno = EINVAL;
+               return -rte_errno;
+       }
        /* First, make sure this address isn't already configured. */
        for (i = 0; (i != MLX5_MAX_MAC_ADDRESSES); ++i) {
                /* Skip this index, it's going to be reconfigured. */
@@ -126,6 +123,61 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
                        return ret;
        }
        dev->data->mac_addrs[index] = *mac;
+       return 0;
+}
+
+/**
+ * DPDK callback to remove a MAC address.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param index
+ *   MAC address index.
+ */
+void
+mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
+{
+       int ret;
+
+       if (index >= MLX5_MAX_UC_MAC_ADDRESSES)
+               return;
+       mlx5_internal_mac_addr_remove(dev, index);
+       if (!dev->data->promiscuous) {
+               ret = mlx5_traffic_restart(dev);
+               if (ret)
+                       DRV_LOG(ERR, "port %u cannot restart traffic: %s",
+                               dev->data->port_id, strerror(rte_errno));
+       }
+}
+
+/**
+ * DPDK callback to add a MAC address.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param mac_addr
+ *   MAC address to register.
+ * @param index
+ *   MAC address index.
+ * @param vmdq
+ *   VMDq pool index to associate address with (ignored).
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx5_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
+                 uint32_t index, uint32_t vmdq __rte_unused)
+{
+       int ret;
+
+       if (index >= MLX5_MAX_UC_MAC_ADDRESSES) {
+               rte_errno = EINVAL;
+               return -rte_errno;
+       }
+       ret = mlx5_internal_mac_addr_add(dev, mac, index);
+       if (ret < 0)
+               return ret;
        if (!dev->data->promiscuous)
                return mlx5_traffic_restart(dev);
        return 0;
@@ -138,17 +190,43 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
  *   Pointer to Ethernet device structure.
  * @param mac_addr
  *   MAC address to register.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-void
-mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+int
+mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
-       int ret;
-
        DRV_LOG(DEBUG, "port %u setting primary MAC address",
                dev->data->port_id);
+       return mlx5_mac_addr_add(dev, mac_addr, 0, 0);
+}
 
-       ret = mlx5_mac_addr_add(dev, mac_addr, 0, 0);
-       if (ret)
-               DRV_LOG(ERR, "port %u cannot set mac address: %s",
-                       dev->data->port_id, strerror(rte_errno));
+/**
+ * DPDK callback to set multicast addresses list.
+ *
+ * @see rte_eth_dev_set_mc_addr_list()
+ */
+int
+mlx5_set_mc_addr_list(struct rte_eth_dev *dev,
+                     struct rte_ether_addr *mc_addr_set, uint32_t nb_mc_addr)
+{
+       uint32_t i;
+       int ret;
+
+       if (nb_mc_addr >= MLX5_MAX_MC_MAC_ADDRESSES) {
+               rte_errno = ENOSPC;
+               return -rte_errno;
+       }
+       for (i = MLX5_MAX_UC_MAC_ADDRESSES; i != MLX5_MAX_MAC_ADDRESSES; ++i)
+               mlx5_internal_mac_addr_remove(dev, i);
+       i = MLX5_MAX_UC_MAC_ADDRESSES;
+       while (nb_mc_addr--) {
+               ret = mlx5_internal_mac_addr_add(dev, mc_addr_set++, i++);
+               if (ret)
+                       return ret;
+       }
+       if (!dev->data->promiscuous)
+               return mlx5_traffic_restart(dev);
+       return 0;
 }