net: add rte prefix to ether defines

[dpdk.git] / drivers / net / avp / avp_ethdev.c

diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c
index 0f8ccb9..bd5eba4 100644 (file)
--- a/drivers/net/avp/avp_ethdev.c
+++ b/drivers/net/avp/avp_ethdev.c
@@ -88,7 +88,7 @@ static void avp_dev_stats_reset(struct rte_eth_dev *dev);
 #define AVP_MAX_RX_BURST 64
 #define AVP_MAX_TX_BURST 64
 #define AVP_MAX_MAC_ADDRS 1
-#define AVP_MIN_RX_BUFSIZE ETHER_MIN_LEN
+#define AVP_MIN_RX_BUFSIZE RTE_ETHER_MIN_LEN
 
 
 /*
@@ -159,7 +159,7 @@ static const struct eth_dev_ops avp_eth_dev_ops = {
 struct avp_dev {
        uint32_t magic; /**< Memory validation marker */
        uint64_t device_id; /**< Unique system identifier */
-       struct ether_addr ethaddr; /**< Host specified MAC address */
+       struct rte_ether_addr ethaddr; /**< Host specified MAC address */
        struct rte_eth_dev_data *dev_data;
        /**< Back pointer to ethernet device data */
        volatile uint32_t flags; /**< Device operational flags */
@@ -867,7 +867,7 @@ avp_dev_create(struct rte_pci_device *pci_dev,
                avp->host_features = host_info->features;
                rte_spinlock_init(&avp->lock);
                memcpy(&avp->ethaddr.addr_bytes[0],
-                      host_info->ethaddr, ETHER_ADDR_LEN);
+                      host_info->ethaddr, RTE_ETHER_ADDR_LEN);
                /* adjust max values to not exceed our max */
                avp->max_tx_queues =
                        RTE_MIN(host_info->max_tx_queues, RTE_AVP_MAX_QUEUES);
@@ -1006,15 +1006,16 @@ eth_avp_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* Allocate memory for storing MAC addresses */
-       eth_dev->data->mac_addrs = rte_zmalloc("avp_ethdev", ETHER_ADDR_LEN, 0);
+       eth_dev->data->mac_addrs = rte_zmalloc("avp_ethdev",
+                                       RTE_ETHER_ADDR_LEN, 0);
        if (eth_dev->data->mac_addrs == NULL) {
                PMD_DRV_LOG(ERR, "Failed to allocate %d bytes needed to store MAC addresses\n",
-                           ETHER_ADDR_LEN);
+                           RTE_ETHER_ADDR_LEN);
                return -ENOMEM;
        }
 
        /* Get a mac from device config */
-       ether_addr_copy(&avp->ethaddr, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(&avp->ethaddr, &eth_dev->data->mac_addrs[0]);
 
        return 0;
 }
@@ -1036,11 +1037,6 @@ eth_avp_dev_uninit(struct rte_eth_dev *eth_dev)
                return ret;
        }
 
-       if (eth_dev->data->mac_addrs != NULL) {
-               rte_free(eth_dev->data->mac_addrs);
-               eth_dev->data->mac_addrs = NULL;
-       }
-
        return 0;
 }
 
@@ -1204,7 +1200,7 @@ avp_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
 }
 
 static inline int
-_avp_cmp_ether_addr(struct ether_addr *a, struct ether_addr *b)
+_avp_cmp_ether_addr(struct rte_ether_addr *a, struct rte_ether_addr *b)
 {
        uint16_t *_a = (uint16_t *)&a->addr_bytes[0];
        uint16_t *_b = (uint16_t *)&b->addr_bytes[0];
@@ -1214,19 +1210,19 @@ _avp_cmp_ether_addr(struct ether_addr *a, struct ether_addr *b)
 static inline int
 _avp_mac_filter(struct avp_dev *avp, struct rte_mbuf *m)
 {
-       struct ether_hdr *eth = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       struct rte_ether_hdr *eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
 
        if (likely(_avp_cmp_ether_addr(&avp->ethaddr, &eth->d_addr) == 0)) {
                /* allow all packets destined to our address */
                return 0;
        }
 
-       if (likely(is_broadcast_ether_addr(&eth->d_addr))) {
+       if (likely(rte_is_broadcast_ether_addr(&eth->d_addr))) {
                /* allow all broadcast packets */
                return 0;
        }
 
-       if (likely(is_multicast_ether_addr(&eth->d_addr))) {
+       if (likely(rte_is_multicast_ether_addr(&eth->d_addr))) {
                /* allow all multicast packets */
                return 0;
        }