Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932291AbcCHJgC (ORCPT ); Tue, 8 Mar 2016 04:36:02 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35099 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbcCHJf4 (ORCPT ); Tue, 8 Mar 2016 04:35:56 -0500 From: Neil Armstrong To: davem@davemloft.net, f.fainelli@gmail.com, andrew@lunn.ch, rmk+kernel@arm.linux.org.uk, pavel.nakonechny@skitlab.ru, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Neil Armstrong Subject: [PATCH] net: dsa: Fix cleanup resources upon module removal Date: Tue, 8 Mar 2016 10:36:20 +0100 Message-Id: <1457429780-7665-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20151207.163608.1805578623951785262.davem@davemloft.net> References: <20151207.163608.1805578623951785262.davem@davemloft.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1574 Lines: 54 The initial commit badly merged into the dsa_resume method instead of the dsa_remove_dst method. As consequence, the dst->master_netdev->dsa_ptr is not set to NULL on removal and re-bind of the dsa device fails with error -17. Fixes: b0dc635d923c ("net: dsa: cleanup resources upon module removal ") Signed-off-by: Neil Armstrong --- net/dsa/dsa.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) David, Florian, Andrew, This fix is quite urgent since it breaks all the removal cleanup. Thanks, Neil diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index fa4daba..d8fb47f 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -935,6 +935,14 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst) { int i; + dst->master_netdev->dsa_ptr = NULL; + + /* If we used a tagging format that doesn't have an ethertype + * field, make sure that all packets from this point get sent + * without the tag and go through the regular receive path. + */ + wmb(); + for (i = 0; i < dst->pd->nr_chips; i++) { struct dsa_switch *ds = dst->ds[i]; @@ -988,14 +996,6 @@ static int dsa_suspend(struct device *d) struct dsa_switch_tree *dst = platform_get_drvdata(pdev); int i, ret = 0; - dst->master_netdev->dsa_ptr = NULL; - - /* If we used a tagging format that doesn't have an ethertype - * field, make sure that all packets from this point get sent - * without the tag and go through the regular receive path. - */ - wmb(); - for (i = 0; i < dst->pd->nr_chips; i++) { struct dsa_switch *ds = dst->ds[i]; -- 1.9.1