net: add rte prefix to ether defines

[dpdk.git] / drivers / net / liquidio / lio_ethdev.c

diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c
index 0e0b5d8..c25dab0 100644 (file)
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
+#include <rte_string_fns.h>
 #include <rte_ethdev_driver.h>
 #include <rte_ethdev_pci.h>
 #include <rte_cycles.h>
@@ -429,7 +430,7 @@ lio_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
 {
        struct lio_device *lio_dev = LIO_DEV(eth_dev);
        uint16_t pf_mtu = lio_dev->linfo.link.s.mtu;
-       uint32_t frame_len = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+       uint32_t frame_len = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
        struct lio_dev_ctrl_cmd ctrl_cmd;
        struct lio_ctrl_pkt ctrl_pkt;
 
@@ -444,9 +445,9 @@ lio_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        /* check if VF MTU is within allowed range.
         * New value should not exceed PF MTU.
         */
-       if ((mtu < ETHER_MIN_MTU) || (mtu > pf_mtu)) {
+       if (mtu < RTE_ETHER_MIN_MTU || mtu > pf_mtu) {
                lio_dev_err(lio_dev, "VF MTU should be >= %d and <= %d\n",
-                           ETHER_MIN_MTU, pf_mtu);
+                           RTE_ETHER_MIN_MTU, pf_mtu);
                return -EINVAL;
        }
 
@@ -475,7 +476,7 @@ lio_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
                return -1;
        }
 
-       if (frame_len > ETHER_MAX_LEN)
+       if (frame_len > RTE_ETHER_MAX_LEN)
                eth_dev->data->dev_conf.rxmode.offloads |=
                        DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
@@ -1405,6 +1406,11 @@ lio_dev_start(struct rte_eth_dev *eth_dev)
        /* Configure RSS if device configured with multiple RX queues. */
        lio_dev_mq_rx_configure(eth_dev);
 
+       /* Before update the link info,
+        * must set linfo.link.link_status64 to 0.
+        */
+       lio_dev->linfo.link.link_status64 = 0;
+
        /* start polling for lsc */
        ret = rte_eal_alarm_set(LIO_LSC_TIMEOUT,
                                lio_sync_link_state_check,
@@ -1423,9 +1429,9 @@ lio_dev_start(struct rte_eth_dev *eth_dev)
                goto dev_mtu_set_error;
        }
 
-       mtu = (uint16_t)(frame_len - ETHER_HDR_LEN - ETHER_CRC_LEN);
-       if (mtu < ETHER_MIN_MTU)
-               mtu = ETHER_MIN_MTU;
+       mtu = (uint16_t)(frame_len - RTE_ETHER_HDR_LEN - RTE_ETHER_CRC_LEN);
+       if (mtu < RTE_ETHER_MIN_MTU)
+               mtu = RTE_ETHER_MIN_MTU;
 
        if (eth_dev->data->mtu != mtu) {
                ret = lio_dev_mtu_set(eth_dev, mtu);
@@ -1706,7 +1712,7 @@ lio_dev_configure(struct rte_eth_dev *eth_dev)
        struct lio_device *lio_dev = LIO_DEV(eth_dev);
        uint16_t timeout = LIO_MAX_CMD_TIMEOUT;
        int retval, num_iqueues, num_oqueues;
-       uint8_t mac[ETHER_ADDR_LEN], i;
+       uint8_t mac[RTE_ETHER_ADDR_LEN], i;
        struct lio_if_cfg_resp *resp;
        struct lio_soft_command *sc;
        union lio_if_cfg if_cfg;
@@ -1776,8 +1782,8 @@ lio_dev_configure(struct rte_eth_dev *eth_dev)
                goto nic_config_fail;
        }
 
-       snprintf(lio_dev->firmware_version, LIO_FW_VERSION_LENGTH, "%s",
-                resp->cfg_info.lio_firmware_version);
+       strlcpy(lio_dev->firmware_version,
+               resp->cfg_info.lio_firmware_version, LIO_FW_VERSION_LENGTH);
 
        lio_swap_8B_data((uint64_t *)(&resp->cfg_info),
                         sizeof(struct octeon_if_cfg_info) >> 3);
@@ -1824,12 +1830,13 @@ lio_dev_configure(struct rte_eth_dev *eth_dev)
 
        /* 64-bit swap required on LE machines */
        lio_swap_8B_data(&lio_dev->linfo.hw_addr, 1);
-       for (i = 0; i < ETHER_ADDR_LEN; i++)
+       for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
                mac[i] = *((uint8_t *)(((uint8_t *)&lio_dev->linfo.hw_addr) +
                                       2 + i));
 
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct ether_addr *)mac, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy((struct rte_ether_addr *)mac,
+                       &eth_dev->data->mac_addrs[0]);
 
        /* enable firmware checksum support for tunnel packets */
        lio_enable_hw_tunnel_rx_checksum(eth_dev);
@@ -2033,14 +2040,11 @@ lio_eth_dev_uninit(struct rte_eth_dev *eth_dev)
        PMD_INIT_FUNC_TRACE();
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return -EPERM;
+               return 0;
 
        /* lio_free_sc_buffer_pool */
        lio_free_sc_buffer_pool(lio_dev);
 
-       rte_free(eth_dev->data->mac_addrs);
-       eth_dev->data->mac_addrs = NULL;
-
        eth_dev->dev_ops = NULL;
        eth_dev->rx_pkt_burst = NULL;
        eth_dev->tx_pkt_burst = NULL;
@@ -2086,7 +2090,7 @@ lio_eth_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        eth_dev->dev_ops = &liovf_eth_dev_ops;
-       eth_dev->data->mac_addrs = rte_zmalloc("lio", ETHER_ADDR_LEN, 0);
+       eth_dev->data->mac_addrs = rte_zmalloc("lio", RTE_ETHER_ADDR_LEN, 0);
        if (eth_dev->data->mac_addrs == NULL) {
                lio_dev_err(lio_dev,
                            "MAC addresses memory allocation failed\n");
@@ -2138,9 +2142,7 @@ RTE_PMD_REGISTER_PCI(net_liovf, rte_liovf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_liovf, pci_id_liovf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_liovf, "* igb_uio | vfio-pci");
 
-RTE_INIT(lio_init_log);
-static void
-lio_init_log(void)
+RTE_INIT(lio_init_log)
 {
        lio_logtype_init = rte_log_register("pmd.net.liquidio.init");
        if (lio_logtype_init >= 0)