[PATCH 3/6] net: dsa: cleanup resources upon module removal
From: Neil Armstrong <hidden>
Date: 2015-10-27 14:49:10
Also in:
lkml
Subsystem:
networking [dsa], networking [general], the rest · Maintainers:
Andrew Lunn, Vladimir Oltean, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
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 <redacted> --- net/dsa/dsa.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 7c9914b..acbf854 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c@@ -951,6 +951,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];
--
1.9.1