diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2016-03-08 10:36:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-10 22:20:17 +0100 |
| commit | 04761890a7cec6a1ff9aafd909004da4fe8059db (patch) | |
| tree | ee3a8df1f5444fd8002c894e5370eac5af81058c /net/dsa | |
| parent | qede: Fix net-next "make ARCH=x86_64" (diff) | |
| download | linux-04761890a7cec6a1ff9aafd909004da4fe8059db.tar.xz linux-04761890a7cec6a1ff9aafd909004da4fe8059db.zip | |
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: b0dc635d923c ("net: dsa: cleanup resources upon module removal ")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/dsa.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index fa4daba8db55..d8fb47fcad05 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]; |