git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ixgbe: remove dependence on Tx queue flags
[dpdk.git]
/
drivers
/
net
/
failsafe
/
failsafe_ether.c
diff --git
a/drivers/net/failsafe/failsafe_ether.c
b/drivers/net/failsafe/failsafe_ether.c
index
4c6e938
..
b414a78
100644
(file)
--- a/
drivers/net/failsafe/failsafe_ether.c
+++ b/
drivers/net/failsafe/failsafe_ether.c
@@
-1,6
+1,6
@@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2017 6WIND S.A.
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2017 6WIND S.A.
- * Copyright 2017 Mellanox
.
+ * Copyright 2017 Mellanox
Technologies, Ltd
*/
#include <unistd.h>
*/
#include <unistd.h>
@@
-280,6
+280,7
@@
fs_dev_remove(struct sub_device *sdev)
/* the end */
break;
}
/* the end */
break;
}
+ sdev->remove = 0;
failsafe_hotplug_alarm_install(sdev->fs_dev);
}
failsafe_hotplug_alarm_install(sdev->fs_dev);
}
@@
-327,8
+328,11
@@
failsafe_dev_remove(struct rte_eth_dev *dev)
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
if (sdev->remove && fs_rxtx_clean(sdev)) {
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
if (sdev->remove && fs_rxtx_clean(sdev)) {
+ if (fs_lock(dev, 1) != 0)
+ return;
fs_dev_stats_save(sdev);
fs_dev_remove(sdev);
fs_dev_stats_save(sdev);
fs_dev_remove(sdev);
+ fs_unlock(dev, 1);
}
}
}
}
@@
-428,6
+432,7
@@
failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,
{
struct sub_device *sdev = cb_arg;
{
struct sub_device *sdev = cb_arg;
+ fs_lock(sdev->fs_dev, 0);
/* Switch as soon as possible tx_dev. */
fs_switch_dev(sdev->fs_dev, sdev);
/* Use safe bursts in any case. */
/* Switch as soon as possible tx_dev. */
fs_switch_dev(sdev->fs_dev, sdev);
/* Use safe bursts in any case. */
@@
-437,6
+442,7
@@
failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,
* the callback at the source of the current thread context.
*/
sdev->remove = 1;
* the callback at the source of the current thread context.
*/
sdev->remove = 1;
+ fs_unlock(sdev->fs_dev, 0);
return 0;
}
return 0;
}