[PATCH v2 3/6] net: dsa: cleanup resources upon module removal

[Neil Armstrong]

Make sure that we unassign the master_netdev dsa_ptr to make the packet
processing go through the regulard Ethernet receive path.

Suggested-by: Florian Fainelli 
Signed-off-by: Neil Armstrong 
---
 net/dsa/dsa.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 19cff8f..b2f696c 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -949,6 +949,14 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
flush_delayed_work(>link_poll_work);
}

+   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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 3/6] net: dsa: cleanup resources upon module removal

[Neil Armstrong]

Make sure that we unassign the master_netdev dsa_ptr to make the packet
processing go through the regulard Ethernet receive path.

Suggested-by: Florian Fainelli 
Signed-off-by: Neil Armstrong 
---
 net/dsa/dsa.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 19cff8f..b2f696c 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -949,6 +949,14 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
flush_delayed_work(>link_poll_work);
}

+   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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/