net: add rte prefix to ether defines

[dpdk.git] / drivers / net / ipn3ke / ipn3ke_representor.c

diff --git a/drivers/net/ipn3ke/ipn3ke_representor.c b/drivers/net/ipn3ke/ipn3ke_representor.c
index 63098bf..f4529f6 100644 (file)
--- a/drivers/net/ipn3ke/ipn3ke_representor.c
+++ b/drivers/net/ipn3ke/ipn3ke_representor.c
@@ -21,6 +21,7 @@
 #include <ifpga_logs.h>
 
 #include "ipn3ke_rawdev_api.h"
+#include "ipn3ke_flow.h"
 #include "ipn3ke_logs.h"
 #include "ipn3ke_ethdev.h"
 
@@ -123,10 +124,11 @@ ipn3ke_rpst_dev_start(struct rte_eth_dev *dev)
        snprintf(attr_name, IPN3KE_RAWDEV_ATTR_LEN_MAX, "%s",
                        "LineSideBaseMAC");
        rawdev->dev_ops->attr_get(rawdev, attr_name, &base_mac);
-       ether_addr_copy((struct ether_addr *)&base_mac, &rpst->mac_addr);
+       rte_ether_addr_copy((struct rte_ether_addr *)&base_mac,
+                       &rpst->mac_addr);
 
-       ether_addr_copy(&rpst->mac_addr, &dev->data->mac_addrs[0]);
-       dev->data->mac_addrs->addr_bytes[ETHER_ADDR_LEN - 1] =
+       rte_ether_addr_copy(&rpst->mac_addr, &dev->data->mac_addrs[0]);
+       dev->data->mac_addrs->addr_bytes[RTE_ETHER_ADDR_LEN - 1] =
                (uint8_t)rpst->port_id + 1;
 
        if (hw->retimer.mac_type == IFPGA_RAWDEV_RETIMER_MAC_TYPE_10GE_XFI) {
@@ -649,19 +651,19 @@ ipn3ke_rpst_allmulticast_disable(struct rte_eth_dev *ethdev)
 
 int
 ipn3ke_rpst_mac_addr_set(struct rte_eth_dev *ethdev,
-                               struct ether_addr *mac_addr)
+                               struct rte_ether_addr *mac_addr)
 {
        struct ipn3ke_hw *hw = IPN3KE_DEV_PRIVATE_TO_HW(ethdev);
        struct ipn3ke_rpst *rpst = IPN3KE_DEV_PRIVATE_TO_RPST(ethdev);
        uint32_t val;
 
-       if (!is_valid_assigned_ether_addr(mac_addr)) {
+       if (!rte_is_valid_assigned_ether_addr(mac_addr)) {
                IPN3KE_AFU_PMD_ERR("Tried to set invalid MAC address.");
                return -EINVAL;
        }
 
        if (hw->retimer.mac_type == IFPGA_RAWDEV_RETIMER_MAC_TYPE_10GE_XFI) {
-               ether_addr_copy(&mac_addr[0], &rpst->mac_addr);
+               rte_ether_addr_copy(&mac_addr[0], &rpst->mac_addr);
 
                /* Set mac address */
                rte_memcpy(((char *)(&val)), &mac_addr[0], sizeof(uint32_t));
@@ -690,7 +692,7 @@ ipn3ke_rpst_mtu_set(struct rte_eth_dev *ethdev, uint16_t mtu)
        uint32_t frame_size = mtu  + IPN3KE_ETH_OVERHEAD;
 
        /* check if mtu is within the allowed range */
-       if (mtu < ETHER_MIN_MTU ||
+       if (mtu < RTE_ETHER_MIN_MTU ||
                frame_size > IPN3KE_MAC_FRAME_SIZE_MAX)
                return -EINVAL;
 
@@ -710,7 +712,7 @@ ipn3ke_rpst_mtu_set(struct rte_eth_dev *ethdev, uint16_t mtu)
                return -EBUSY;
        }
 
-       if (frame_size > ETHER_MAX_LEN)
+       if (frame_size > RTE_ETHER_MAX_LEN)
                dev_data->dev_conf.rxmode.offloads |=
                        (uint64_t)(DEV_RX_OFFLOAD_JUMBO_FRAME);
        else
@@ -746,7 +748,7 @@ ipn3ke_afu_filter_ctrl(struct rte_eth_dev *ethdev,
                case RTE_ETH_FILTER_GENERIC:
                        if (filter_op != RTE_ETH_FILTER_GET)
                                return -EINVAL;
-                       *(const void **)arg = NULL;
+                       *(const void **)arg = &ipn3ke_flow_ops;
                        break;
                default:
                        IPN3KE_AFU_PMD_WARN("Filter type (%d) not supported",
@@ -835,7 +837,7 @@ ipn3ke_rpst_init(struct rte_eth_dev *ethdev, void *init_params)
        rpst->i40e_pf_eth = NULL;
        rpst->i40e_pf_eth_port_id = 0xFFFF;
 
-       ethdev->data->mac_addrs = rte_zmalloc("ipn3ke", ETHER_ADDR_LEN, 0);
+       ethdev->data->mac_addrs = rte_zmalloc("ipn3ke", RTE_ETHER_ADDR_LEN, 0);
        if (!ethdev->data->mac_addrs) {
                IPN3KE_AFU_PMD_ERR("Failed to "
                        "allocated memory for storing mac address");
@@ -858,7 +860,7 @@ ipn3ke_rpst_init(struct rte_eth_dev *ethdev, void *init_params)
        ethdev->data->nb_tx_queues = 1;
 
        ethdev->data->mac_addrs = rte_zmalloc("ipn3ke_afu_representor",
-                                               ETHER_ADDR_LEN,
+                                               RTE_ETHER_ADDR_LEN,
                                                0);
        if (!ethdev->data->mac_addrs) {
                IPN3KE_AFU_PMD_ERR("Failed to "