net: add rte prefix to ether defines

[dpdk.git] / drivers / net / enic / enic_ethdev.c

diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 8d14d8a..80fbf59 100644 (file)
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -604,7 +604,7 @@ static void enicpmd_dev_allmulticast_disable(struct rte_eth_dev *eth_dev)
 }
 
 static int enicpmd_add_mac_addr(struct rte_eth_dev *eth_dev,
-       struct ether_addr *mac_addr,
+       struct rte_ether_addr *mac_addr,
        __rte_unused uint32_t index, __rte_unused uint32_t pool)
 {
        struct enic *enic = pmd_priv(eth_dev);
@@ -629,7 +629,7 @@ static void enicpmd_remove_mac_addr(struct rte_eth_dev *eth_dev, uint32_t index)
 }
 
 static int enicpmd_set_mac_addr(struct rte_eth_dev *eth_dev,
-                               struct ether_addr *addr)
+                               struct rte_ether_addr *addr)
 {
        struct enic *enic = pmd_priv(eth_dev);
        int ret;
@@ -644,22 +644,22 @@ static int enicpmd_set_mac_addr(struct rte_eth_dev *eth_dev,
        return enic_set_mac_address(enic, addr->addr_bytes);
 }
 
-static void debug_log_add_del_addr(struct ether_addr *addr, bool add)
+static void debug_log_add_del_addr(struct rte_ether_addr *addr, bool add)
 {
-       char mac_str[ETHER_ADDR_FMT_SIZE];
+       char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
 
-       ether_format_addr(mac_str, ETHER_ADDR_FMT_SIZE, addr);
+       rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, addr);
        PMD_INIT_LOG(DEBUG, " %s address %s\n",
                     add ? "add" : "remove", mac_str);
 }
 
 static int enicpmd_set_mc_addr_list(struct rte_eth_dev *eth_dev,
-                                   struct ether_addr *mc_addr_set,
+                                   struct rte_ether_addr *mc_addr_set,
                                    uint32_t nb_mc_addr)
 {
        struct enic *enic = pmd_priv(eth_dev);
-       char mac_str[ETHER_ADDR_FMT_SIZE];
-       struct ether_addr *addr;
+       char mac_str[RTE_ETHER_ADDR_FMT_SIZE];
+       struct rte_ether_addr *addr;
        uint32_t i, j;
        int ret;
 
@@ -668,9 +668,10 @@ static int enicpmd_set_mc_addr_list(struct rte_eth_dev *eth_dev,
        /* Validate the given addresses first */
        for (i = 0; i < nb_mc_addr && mc_addr_set != NULL; i++) {
                addr = &mc_addr_set[i];
-               if (!is_multicast_ether_addr(addr) ||
-                   is_broadcast_ether_addr(addr)) {
-                       ether_format_addr(mac_str, ETHER_ADDR_FMT_SIZE, addr);
+               if (!rte_is_multicast_ether_addr(addr) ||
+                   rte_is_broadcast_ether_addr(addr)) {
+                       rte_ether_format_addr(mac_str,
+                                       RTE_ETHER_ADDR_FMT_SIZE, addr);
                        PMD_INIT_LOG(ERR, " invalid multicast address %s\n",
                                     mac_str);
                        return -EINVAL;
@@ -704,7 +705,7 @@ static int enicpmd_set_mc_addr_list(struct rte_eth_dev *eth_dev,
        for (i = 0; i < enic->mc_count; i++) {
                addr = &enic->mc_addrs[i];
                for (j = 0; j < nb_mc_addr; j++) {
-                       if (is_same_ether_addr(addr, &mc_addr_set[j]))
+                       if (rte_is_same_ether_addr(addr, &mc_addr_set[j]))
                                break;
                }
                if (j < nb_mc_addr)
@@ -718,7 +719,7 @@ static int enicpmd_set_mc_addr_list(struct rte_eth_dev *eth_dev,
        for (i = 0; i < nb_mc_addr; i++) {
                addr = &mc_addr_set[i];
                for (j = 0; j < enic->mc_count; j++) {
-                       if (is_same_ether_addr(addr, &enic->mc_addrs[j]))
+                       if (rte_is_same_ether_addr(addr, &enic->mc_addrs[j]))
                                break;
                }
                if (j < enic->mc_count)
@@ -730,7 +731,7 @@ static int enicpmd_set_mc_addr_list(struct rte_eth_dev *eth_dev,
        }
        /* Keep a copy so we can flush/apply later on.. */
        memcpy(enic->mc_addrs, mc_addr_set,
-              nb_mc_addr * sizeof(struct ether_addr));
+              nb_mc_addr * sizeof(struct rte_ether_addr));
        enic->mc_count = nb_mc_addr;
        return 0;
 }