import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / liquidio / lio_ethdev.c

diff --git a/ceph/src/spdk/dpdk/drivers/net/liquidio/lio_ethdev.c b/ceph/src/spdk/dpdk/drivers/net/liquidio/lio_ethdev.c
index 93e89007a83486e312c113816cba46a976af25d5..c9cabd65a340241ff7b1ea12ae72ece71f5aac43 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/liquidio/lio_ethdev.c
+++ b/ceph/src/spdk/dpdk/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>
@@ -1781,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);
@@ -2038,14 +2039,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;