net: add rte prefix to ether defines

[dpdk.git] / lib / librte_ethdev / rte_ethdev.c

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index b868535..72bb338 100644 (file)
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -500,7 +500,7 @@ rte_eth_dev_allocate(const char *name)
        eth_dev = eth_dev_get(port_id);
        strlcpy(eth_dev->data->name, name, sizeof(eth_dev->data->name));
        eth_dev->data->port_id = port_id;
-       eth_dev->data->mtu = ETHER_MTU;
+       eth_dev->data->mtu = RTE_ETHER_MTU;
 
 unlock:
        rte_spinlock_unlock(&rte_eth_dev_shared_data->ownership_lock);
@@ -1224,20 +1224,20 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                dev_info.max_rx_pktlen);
                        ret = -EINVAL;
                        goto rollback;
-               } else if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN) {
+               } else if (dev_conf->rxmode.max_rx_pkt_len < RTE_ETHER_MIN_LEN) {
                        RTE_ETHDEV_LOG(ERR,
                                "Ethdev port_id=%u max_rx_pkt_len %u < min valid value %u\n",
                                port_id, dev_conf->rxmode.max_rx_pkt_len,
-                               (unsigned)ETHER_MIN_LEN);
+                               (unsigned int)RTE_ETHER_MIN_LEN);
                        ret = -EINVAL;
                        goto rollback;
                }
        } else {
-               if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN ||
-                       dev_conf->rxmode.max_rx_pkt_len > ETHER_MAX_LEN)
+               if (dev_conf->rxmode.max_rx_pkt_len < RTE_ETHER_MIN_LEN ||
+                       dev_conf->rxmode.max_rx_pkt_len > RTE_ETHER_MAX_LEN)
                        /* Use default value */
                        dev->data->dev_conf.rxmode.max_rx_pkt_len =
-                                                       ETHER_MAX_LEN;
+                                                       RTE_ETHER_MAX_LEN;
        }
 
        /* Any requested offloading must be within its device capabilities */
@@ -1363,7 +1363,7 @@ rte_eth_dev_mac_restore(struct rte_eth_dev *dev,
                        addr = &dev->data->mac_addrs[i];
 
                        /* skip zero address */
-                       if (is_zero_ether_addr(addr))
+                       if (rte_is_zero_ether_addr(addr))
                                continue;
 
                        pool = 0;
@@ -2552,7 +2552,7 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info)
        dev_info->rx_desc_lim = lim;
        dev_info->tx_desc_lim = lim;
        dev_info->device = dev->device;
-       dev_info->min_mtu = ETHER_MIN_MTU;
+       dev_info->min_mtu = RTE_ETHER_MIN_MTU;
        dev_info->max_mtu = UINT16_MAX;
 
        RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get);
@@ -2597,7 +2597,7 @@ rte_eth_macaddr_get(uint16_t port_id, struct rte_ether_addr *mac_addr)
 
        RTE_ETH_VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
-       ether_addr_copy(&dev->data->mac_addrs[0], mac_addr);
+       rte_ether_addr_copy(&dev->data->mac_addrs[0], mac_addr);
 }
 
 
@@ -3088,7 +3088,8 @@ get_mac_addr_index(uint16_t port_id, const struct rte_ether_addr *addr)
        rte_eth_dev_info_get(port_id, &dev_info);
 
        for (i = 0; i < dev_info.max_mac_addrs; i++)
-               if (memcmp(addr, &dev->data->mac_addrs[i], ETHER_ADDR_LEN) == 0)
+               if (memcmp(addr, &dev->data->mac_addrs[i],
+                               RTE_ETHER_ADDR_LEN) == 0)
                        return i;
 
        return -1;
@@ -3109,7 +3110,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr,
        dev = &rte_eth_devices[port_id];
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
 
-       if (is_zero_ether_addr(addr)) {
+       if (rte_is_zero_ether_addr(addr)) {
                RTE_ETHDEV_LOG(ERR, "Port %u: Cannot add NULL MAC address\n",
                        port_id);
                return -EINVAL;
@@ -3140,7 +3141,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr,
 
        if (ret == 0) {
                /* Update address in NIC data structure */
-               ether_addr_copy(addr, &dev->data->mac_addrs[index]);
+               rte_ether_addr_copy(addr, &dev->data->mac_addrs[index]);
 
                /* Update pool bitmap in NIC data structure */
                dev->data->mac_pool_sel[index] |= (1ULL << pool);
@@ -3172,7 +3173,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr)
        (*dev->dev_ops->mac_addr_remove)(dev, index);
 
        /* Update address in NIC data structure */
-       ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]);
+       rte_ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]);
 
        /* reset pool bitmap */
        dev->data->mac_pool_sel[index] = 0;
@@ -3188,7 +3189,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr)
 
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if (!is_valid_assigned_ether_addr(addr))
+       if (!rte_is_valid_assigned_ether_addr(addr))
                return -EINVAL;
 
        dev = &rte_eth_devices[port_id];
@@ -3199,7 +3200,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr)
                return ret;
 
        /* Update default address in NIC data structure */
-       ether_addr_copy(addr, &dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(addr, &dev->data->mac_addrs[0]);
 
        return 0;
 }
@@ -3222,7 +3223,7 @@ get_hash_mac_addr_index(uint16_t port_id, const struct rte_ether_addr *addr)
 
        for (i = 0; i < dev_info.max_hash_mac_addrs; i++)
                if (memcmp(addr, &dev->data->hash_mac_addrs[i],
-                       ETHER_ADDR_LEN) == 0)
+                       RTE_ETHER_ADDR_LEN) == 0)
                        return i;
 
        return -1;
@@ -3239,7 +3240,7 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct rte_ether_addr *addr,
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
-       if (is_zero_ether_addr(addr)) {
+       if (rte_is_zero_ether_addr(addr)) {
                RTE_ETHDEV_LOG(ERR, "Port %u: Cannot add NULL MAC address\n",
                        port_id);
                return -EINVAL;
@@ -3271,10 +3272,10 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct rte_ether_addr *addr,
        if (ret == 0) {
                /* Update address in NIC data structure */
                if (on)
-                       ether_addr_copy(addr,
+                       rte_ether_addr_copy(addr,
                                        &dev->data->hash_mac_addrs[index]);
                else
-                       ether_addr_copy(&null_mac_addr,
+                       rte_ether_addr_copy(&null_mac_addr,
                                        &dev->data->hash_mac_addrs[index]);
        }