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
|
||
|
|
|