net: add rte prefix to ether defines

[dpdk.git] / drivers / net / mlx4 / mlx4_ethdev.c

diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c
index 765affc..3d18aa4 100644 (file)
--- a/drivers/net/mlx4/mlx4_ethdev.c
+++ b/drivers/net/mlx4/mlx4_ethdev.c
@@ -176,14 +176,14 @@ mlx4_ifreq(const struct mlx4_priv *priv, int req, struct ifreq *ifr)
  *   0 on success, negative errno value otherwise and rte_errno is set.
  */
 int
-mlx4_get_mac(struct mlx4_priv *priv, uint8_t (*mac)[ETHER_ADDR_LEN])
+mlx4_get_mac(struct mlx4_priv *priv, uint8_t (*mac)[RTE_ETHER_ADDR_LEN])
 {
        struct ifreq request;
        int ret = mlx4_ifreq(priv, SIOCGIFHWADDR, &request);
 
        if (ret)
                return ret;
-       memcpy(mac, request.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
+       memcpy(mac, request.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN);
        return 0;
 }
 
@@ -463,7 +463,7 @@ mlx4_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
  *   0 on success, negative errno value otherwise and rte_errno is set.
  */
 int
-mlx4_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
+mlx4_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
                  uint32_t index, uint32_t vmdq)
 {
        struct mlx4_priv *priv = dev->data->dev_private;
@@ -501,7 +501,7 @@ mlx4_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
  *   0 on success, negative errno value otherwise and rte_errno is set.
  */
 int
-mlx4_set_mc_addr_list(struct rte_eth_dev *dev, struct ether_addr *list,
+mlx4_set_mc_addr_list(struct rte_eth_dev *dev, struct rte_ether_addr *list,
                      uint32_t num)
 {
        struct mlx4_priv *priv = dev->data->dev_private;
@@ -522,7 +522,7 @@ mlx4_set_mc_addr_list(struct rte_eth_dev *dev, struct ether_addr *list,
                for (i = RTE_DIM(priv->mac) - num;
                     i != RTE_DIM(priv->mac) - priv->mac_mc;
                     ++i)
-                       if (!is_zero_ether_addr(&priv->mac[i])) {
+                       if (!rte_is_zero_ether_addr(&priv->mac[i])) {
                                rte_errno = EBUSY;
                                return -rte_errno;
                        }
@@ -598,7 +598,7 @@ mlx4_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
  *   0 on success, negative errno value otherwise and rte_errno is set.
  */
 int
-mlx4_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+mlx4_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
        return mlx4_mac_addr_add(dev, mac_addr, 0, 0);
 }