Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04761890 authored by Neil Armstrong's avatar Neil Armstrong Committed by David S. Miller
Browse files

net: dsa: Fix cleanup resources upon module removal 



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: b0dc635d ("net: dsa: cleanup resources upon module removal ")
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88f09bd5

net/dsa/dsa.c

+8 −8
Original line number Diff line number Diff line
@@ -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];