net: dsa: cleanup resources upon module removal

PATCH Superseded Neil Armstrong 1 participant 1 message Oct 29, 2015

Subsystems (3)

Networking Network drivers Networking DSA

lore

Share & tools

lore

Neil Armstrong

author

2015-10-29 13:23 UTC #0 lore raw

PATCH v2 3/6 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 regulard Ethernet receive path.

Signed-off-by Neil Armstrong <[email protected]>

---
 net/dsa/dsa.c | 8 ++++++++
 1 file changed, 8 insertions(+)

net/dsa/dsa.c +8 -0

index 19cff8f..b2f696c 100644
@@ -949,6 +949,14 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
 		flush_delayed_work(&dst->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];

Signature · 1 line

1.9.1