d761fec5f6
- Applied all the fixes recommended by upstream for v2.2 stable release(bsc#981996). [+0008-app-testpmd-handle-SIGINT-and-SIGTERM.patch, +0009-bonding-copy-entire-config-structure-in-mode-4.patch, +0010-bonding-fix-active-slaves-with-no-primary.patch, +0011-bonding-do-not-ignore-multicast-in-mode-4.patch, +0012-bonding-do-not-activate-slave-twice.patch, +0013-bonding-fix-crash-when-no-slave-device.patch, +0014-bonding-fix-detach-of-bonded-device.patch, +0015-bonding-fix-detach-of-slave-devices.patch, +0016-eal-linux-support-built-in-kernel-modules.patch, +0017-examples-l3fwd-handle-SIGINT-and-SIGTERM.patch, +0018-fm10k-fix-VLAN-flag-in-scattered-Rx.patch, +0019-i40e-base-fix-driver-load-failure.patch, +0020-i40e-base-fix-missing-check-for-stopped-admin-queue.patch, +0021-i40e-fix-inverted-check-for-no-refcount.patch, +0022-i40e-fix-overflow.patch, +0023-i40e-fix-VLAN-filtering.patch, +0024-mempool-fix-leak-when-creation-fails.patch, +0025-pcap-fix-captured-frame-length.patch, +0026-port-fix-crash-for-ethdev-writer-nodrop.patch, +0027-port-fix-crash-for-ring-writer-nodrop.patch, +0028-tools-fix-unbinding-failure-handling.patch, +0029-tools-support-Python-3-in-bind-script.patch, +0030-tools-support-binding-to-built-in-kernel-modules.patch, +0031-vhost-fix-leak-of-fds-and-mmaps.patch, +0032-virtio-fix-crash-in-statistics-functions.patch, +0033-virtio-fix-descriptors-pointing-to-the-same-buffer.patch, +0034-virtio-fix-restart.patch] OBS-URL: https://build.opensuse.org/request/show/399089 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=3
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From 6e02723754fb2b341701ac438486b2dfea98b523 Mon Sep 17 00:00:00 2001
|
|
From: Bernard Iremonger <bernard.iremonger@intel.com>
|
|
Date: Wed, 10 Feb 2016 10:13:44 +0000
|
|
Subject: [PATCH] bonding: fix detach of bonded device
|
|
|
|
Check that the bonded device has no slaves before detaching it.
|
|
|
|
Fixes: 8d30fe7fa737 ("bonding: support port hotplug")
|
|
|
|
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
|
|
Acked-by: Declan Doherty <declan.doherty@intel.com>
|
|
---
|
|
drivers/net/bonding/rte_eth_bond_api.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
|
|
index 8a000c8..484a6f3 100644
|
|
--- a/drivers/net/bonding/rte_eth_bond_api.c
|
|
+++ b/drivers/net/bonding/rte_eth_bond_api.c
|
|
@@ -1,7 +1,7 @@
|
|
/*-
|
|
* BSD LICENSE
|
|
*
|
|
- * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
|
|
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
@@ -277,6 +277,7 @@ int
|
|
rte_eth_bond_free(const char *name)
|
|
{
|
|
struct rte_eth_dev *eth_dev = NULL;
|
|
+ struct bond_dev_private *internals;
|
|
|
|
/* now free all data allocation - for eth_dev structure,
|
|
* dummy pci driver and internal (private) data
|
|
@@ -287,6 +288,10 @@ rte_eth_bond_free(const char *name)
|
|
if (eth_dev == NULL)
|
|
return -ENODEV;
|
|
|
|
+ internals = eth_dev->data->dev_private;
|
|
+ if (internals->slave_count != 0)
|
|
+ return -EBUSY;
|
|
+
|
|
if (eth_dev->data->dev_started == 1) {
|
|
bond_ethdev_stop(eth_dev);
|
|
bond_ethdev_close(eth_dev);
|
|
--
|
|
2.6.2
|
|
|