net: dsa: cleanup resources upon module removal
authorNeil Armstrong <narmstrong@baylibre.com>
Mon, 7 Dec 2015 12:57:33 +0000 (13:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Dec 2015 21:35:50 +0000 (16:35 -0500)
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 <f.fainelli@gmail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/dsa.c

index 0f41f71efac1c6f90f9c6db74ad44aa708ad09a8..d9e0172116b699c7527bf3bfe664089532931419 100644 (file)
@@ -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];