diff options
| author | Neil Armstrong <[email protected]> | 2015-12-07 12:57:33 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-12-07 21:35:50 +0000 |
| commit | b0dc635d923cd5aafa4e99973f529bf68c582738 (patch) | |
| tree | 294a7a7452684e626f7cf06f92f0e237e87e3a53 /net/dsa/dsa.c | |
| parent | net: dsa: remove DSA link polling (diff) | |
| download | kernel-b0dc635d923cd5aafa4e99973f529bf68c582738.tar.gz kernel-b0dc635d923cd5aafa4e99973f529bf68c582738.zip | |
net: dsa: cleanup resources upon module removal
Make sure that we unassign the master_netdev dsa_ptr to make the packet
processing go through the regular Ethernet receive path.
Suggested-by: Florian Fainelli <[email protected]>
Signed-off-by: Neil Armstrong <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/dsa/dsa.c')
| -rw-r--r-- | net/dsa/dsa.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 0f41f71efac1..d9e0172116b6 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -985,6 +985,14 @@ 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]; |