net: add rte prefix to ether defines

[dpdk.git] / drivers / net / cxgbe / cxgbe_ethdev.c

diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index b2f83ea..c035596 100644 (file)
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -57,7 +57,7 @@
 /*
  *... and the PCI ID Table itself ...
  */
-#include "t4_pci_id_tbl.h"
+#include "base/t4_pci_id_tbl.h"
 
 uint16_t cxgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                         uint16_t nb_pkts)
@@ -200,7 +200,8 @@ int cxgbe_dev_link_update(struct rte_eth_dev *eth_dev,
                cxgbe_poll(&s->fw_evtq, NULL, budget, &work_done);
 
                /* Exit if link status changed or always forced up */
-               if (pi->link_cfg.link_ok != old_link || force_linkup(adapter))
+               if (pi->link_cfg.link_ok != old_link ||
+                   cxgbe_force_linkup(adapter))
                        break;
 
                if (!wait_to_complete)
@@ -209,7 +210,7 @@ int cxgbe_dev_link_update(struct rte_eth_dev *eth_dev,
                rte_delay_ms(CXGBE_LINK_STATUS_POLL_MS);
        }
 
-       new_link.link_status = force_linkup(adapter) ?
+       new_link.link_status = cxgbe_force_linkup(adapter) ?
                               ETH_LINK_UP : pi->link_cfg.link_ok;
        new_link.link_autoneg = pi->link_cfg.autoneg;
        new_link.link_duplex = ETH_LINK_FULL_DUPLEX;
@@ -276,16 +277,16 @@ int cxgbe_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        struct adapter *adapter = pi->adapter;
        struct rte_eth_dev_info dev_info;
        int err;
-       uint16_t new_mtu = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+       uint16_t new_mtu = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
 
        cxgbe_dev_info_get(eth_dev, &dev_info);
 
-       /* Must accommodate at least ETHER_MIN_MTU */
-       if ((new_mtu < ETHER_MIN_MTU) || (new_mtu > dev_info.max_rx_pktlen))
+       /* Must accommodate at least RTE_ETHER_MIN_MTU */
+       if (new_mtu < RTE_ETHER_MIN_MTU || new_mtu > dev_info.max_rx_pktlen)
                return -EINVAL;
 
        /* set to jumbo mode if needed */
-       if (new_mtu > ETHER_MAX_LEN)
+       if (new_mtu > RTE_ETHER_MAX_LEN)
                eth_dev->data->dev_conf.rxmode.offloads |=
                        DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
@@ -356,7 +357,7 @@ int cxgbe_dev_start(struct rte_eth_dev *eth_dev)
 
        cxgbe_enable_rx_queues(pi);
 
-       err = setup_rss(pi);
+       err = cxgbe_setup_rss(pi);
        if (err)
                goto out;
 
@@ -372,7 +373,7 @@ int cxgbe_dev_start(struct rte_eth_dev *eth_dev)
                        goto out;
        }
 
-       err = link_start(pi);
+       err = cxgbe_link_start(pi);
        if (err)
                goto out;
 
@@ -412,18 +413,18 @@ int cxgbe_dev_configure(struct rte_eth_dev *eth_dev)
        CXGBE_FUNC_TRACE();
 
        if (!(adapter->flags & FW_QUEUE_BOUND)) {
-               err = setup_sge_fwevtq(adapter);
+               err = cxgbe_setup_sge_fwevtq(adapter);
                if (err)
                        return err;
                adapter->flags |= FW_QUEUE_BOUND;
                if (is_pf4(adapter)) {
-                       err = setup_sge_ctrl_txq(adapter);
+                       err = cxgbe_setup_sge_ctrl_txq(adapter);
                        if (err)
                                return err;
                }
        }
 
-       err = cfg_queue_count(eth_dev);
+       err = cxgbe_cfg_queue_count(eth_dev);
        if (err)
                return err;
 
@@ -586,7 +587,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
 
        cxgbe_dev_info_get(eth_dev, &dev_info);
 
-       /* Must accommodate at least ETHER_MIN_MTU */
+       /* Must accommodate at least RTE_ETHER_MIN_MTU */
        if ((pkt_len < dev_info.min_rx_bufsize) ||
            (pkt_len > dev_info.max_rx_pktlen)) {
                dev_err(adap, "%s: max pkt len must be > %d and <= %d\n",
@@ -625,7 +626,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
                rxq->fl.size = temp_nb_desc;
 
        /* Set to jumbo mode if necessary */
-       if (pkt_len > ETHER_MAX_LEN)
+       if (pkt_len > RTE_ETHER_MAX_LEN)
                eth_dev->data->dev_conf.rxmode.offloads |=
                        DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
@@ -633,7 +634,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
                        ~DEV_RX_OFFLOAD_JUMBO_FRAME;
 
        err = t4_sge_alloc_rxq(adapter, &rxq->rspq, false, eth_dev, msi_idx,
-                              &rxq->fl, t4_ethrx_handler,
+                              &rxq->fl, NULL,
                               is_pf4(adapter) ?
                               t4_get_tp_ch_map(adapter, pi->tx_chan) : 0, mp,
                               queue_idx, socket_id);
@@ -1055,7 +1056,7 @@ static int cxgbe_get_regs(struct rte_eth_dev *eth_dev,
        return 0;
 }
 
-int cxgbe_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *addr)
+int cxgbe_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr)
 {
        struct port_info *pi = (struct port_info *)(dev->data->dev_private);
        int ret;