import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / failsafe / failsafe_eal.c

diff --git a/ceph/src/spdk/dpdk/drivers/net/failsafe/failsafe_eal.c b/ceph/src/spdk/dpdk/drivers/net/failsafe/failsafe_eal.c
index ce1633f1399bd061769debdded5dd3ed904e3abe..820a915f776455e2254555fb0cccea7f67d7a4bf 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/failsafe/failsafe_eal.c
+++ b/ceph/src/spdk/dpdk/drivers/net/failsafe/failsafe_eal.c
@@ -3,6 +3,7 @@
  * Copyright 2017 Mellanox Technologies, Ltd
  */
 
+#include <rte_string_fns.h>
 #include <rte_malloc.h>
 
 #include "failsafe_private.h"
@@ -84,8 +85,9 @@ fs_bus_init(struct rte_eth_dev *dev)
                                snprintf(devstr, sizeof(devstr), "%s,%s",
                                         probed_da->name, probed_da->args);
                        else
-                               snprintf(devstr, sizeof(devstr), "%s",
-                                        rte_eth_devices[pid].device->name);
+                               strlcpy(devstr,
+                                       rte_eth_devices[pid].device->name,
+                                       sizeof(devstr));
                        ret = rte_devargs_parse(da, devstr);
                        if (ret) {
                                ERROR("Probed devargs parsing failed with code"
@@ -112,9 +114,9 @@ fs_bus_init(struct rte_eth_dev *dev)
                                continue;
                        }
                }
-               ETH(sdev) = &rte_eth_devices[pid];
+               sdev->sdev_port_id = pid;
                SUB_ID(sdev) = i;
-               sdev->fs_dev = dev;
+               sdev->fs_port_id = dev->data->port_id;
                sdev->dev = ETH(sdev)->device;
                sdev->state = DEV_PROBED;
        }
@@ -144,8 +146,7 @@ fs_bus_uninit(struct rte_eth_dev *dev)
        int ret = 0;
 
        FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
-               sdev_ret = rte_eal_hotplug_remove(sdev->bus->name,
-                                                       sdev->dev->name);
+               sdev_ret = rte_dev_remove(sdev->dev);
                if (sdev_ret) {
                        ERROR("Failed to remove requested device %s (err: %d)",
                              sdev->dev->name, sdev_ret);