net: add rte prefix to ether functions

[dpdk.git] / drivers / net / nfb / nfb_ethdev.c

diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c
index be7cced..ffdc2bf 100644 (file)
--- a/drivers/net/nfb/nfb_ethdev.c
+++ b/drivers/net/nfb/nfb_ethdev.c
@@ -20,7 +20,7 @@
 /**
  * Default MAC addr
  */
-static const struct ether_addr eth_addr = {
+static const struct rte_ether_addr eth_addr = {
        .addr_bytes = { 0x00, 0x11, 0x17, 0x00, 0x00, 0x00 }
 };
 
@@ -352,7 +352,7 @@ nfb_eth_dev_set_link_down(struct rte_eth_dev *dev)
  */
 static int
 nfb_eth_mac_addr_set(struct rte_eth_dev *dev,
-       struct ether_addr *mac_addr)
+       struct rte_ether_addr *mac_addr)
 {
        unsigned int i;
        uint64_t mac = 0;
@@ -360,7 +360,7 @@ nfb_eth_mac_addr_set(struct rte_eth_dev *dev,
        struct pmd_internals *internals = (struct pmd_internals *)
                data->dev_private;
 
-       if (!is_valid_assigned_ether_addr(mac_addr))
+       if (!rte_is_valid_assigned_ether_addr(mac_addr))
                return -EINVAL;
 
        for (i = 0; i < ETHER_ADDR_LEN; i++) {
@@ -371,7 +371,7 @@ nfb_eth_mac_addr_set(struct rte_eth_dev *dev,
        for (i = 0; i < internals->max_rxmac; ++i)
                nc_rxmac_set_mac(internals->rxmac[i], 0, mac, 1);
 
-       ether_addr_copy(mac_addr, data->mac_addrs);
+       rte_ether_addr_copy(mac_addr, data->mac_addrs);
        return 0;
 }
 
@@ -418,7 +418,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)
                data->dev_private;
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_pci_addr *pci_addr = &pci_dev->addr;
-       struct ether_addr eth_addr_init;
+       struct rte_ether_addr eth_addr_init;
 
        RTE_LOG(INFO, PMD, "Initializing NFB device (" PCI_PRI_FMT ")\n",
                pci_addr->domain, pci_addr->bus, pci_addr->devid,
@@ -464,7 +464,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)
        nfb_eth_link_update(dev, 0);
 
        /* Allocate space for one mac address */
-       data->mac_addrs = rte_zmalloc(data->name, sizeof(struct ether_addr),
+       data->mac_addrs = rte_zmalloc(data->name, sizeof(struct rte_ether_addr),
                RTE_CACHE_LINE_SIZE);
        if (data->mac_addrs == NULL) {
                RTE_LOG(ERR, PMD, "Could not alloc space for MAC address!\n");
@@ -472,7 +472,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)
                return -EINVAL;
        }
 
-       eth_random_addr(eth_addr_init.addr_bytes);
+       rte_eth_random_addr(eth_addr_init.addr_bytes);
        eth_addr_init.addr_bytes[0] = eth_addr.addr_bytes[0];
        eth_addr_init.addr_bytes[1] = eth_addr.addr_bytes[1];
        eth_addr_init.addr_bytes[2] = eth_addr.addr_bytes[2];