New upstream version 17.11.3

[deb_dpdk.git] / drivers / net / failsafe / failsafe.c

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 6bc5aba..41b4cb0 100644 (file)
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -46,7 +46,7 @@ static const struct rte_eth_link eth_link = {
        .link_speed = ETH_SPEED_NUM_10G,
        .link_duplex = ETH_LINK_FULL_DUPLEX,
        .link_status = ETH_LINK_UP,
-       .link_autoneg = ETH_LINK_SPEED_AUTONEG,
+       .link_autoneg = ETH_LINK_AUTONEG,
 };
 
 static int
@@ -210,7 +210,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                                                               mac);
                        if (ret) {
                                ERROR("Failed to set default MAC address");
-                               goto free_args;
+                               goto cancel_alarm;
                        }
                }
        } else {
@@ -240,6 +240,8 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                mac->addr_bytes[4], mac->addr_bytes[5]);
        dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
        return 0;
+cancel_alarm:
+       failsafe_hotplug_alarm_cancel(dev);
 free_args:
        failsafe_args_free(dev);
 free_subs: