From patchwork Wed Feb 10 10:13:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 10458 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 23BC695D7; Wed, 10 Feb 2016 11:14:01 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id CE0DC559C for ; Wed, 10 Feb 2016 11:13:59 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 10 Feb 2016 02:13:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,425,1449561600"; d="scan'208";a="743565231" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 10 Feb 2016 02:13:52 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u1AADptq019250; Wed, 10 Feb 2016 10:13:51 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id u1AADprE007779; Wed, 10 Feb 2016 10:13:51 GMT Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id u1AADpqm007775; Wed, 10 Feb 2016 10:13:51 GMT From: Bernard Iremonger To: dev@dpdk.org Date: Wed, 10 Feb 2016 10:13:44 +0000 Message-Id: <1455099225-7731-2-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1455099225-7731-1-git-send-email-bernard.iremonger@intel.com> References: <1455099225-7731-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH 1/2] bonding: fix detach of bonded device X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Check that the bonded device has no slaves before detaching it. Fixes: 8d30fe7fa737 ("bonding: support port hotplug") Signed-off-by: Bernard Iremonger --- 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);