[<prev] [next>] [day] [month] [year] [list]
Message-ID: <562F8EDF.9080604@baylibre.com>
Date: Tue, 27 Oct 2015 15:49:03 +0100
From: Neil Armstrong <narmstrong@...libre.com>
To: "David S. Miller" <davem@...emloft.net>
Cc: Andrew Lunn <andrew@...n.ch>,
Florian Fainelli <f.fainelli@...il.com>,
Guenter Roeck <linux@...ck-us.net>,
vivien.didelot@...oirfairelinux.com,
Fabian Frederick <fabf@...net.be>,
Pavel Nakonechny <pavel.nakonechny@...tlab.ru>,
Joe Perches <joe@...ches.com>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, Frode Isaksen <fisaksen@...libre.com>
Subject: [PATCH 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 regular Ethernet receive path.
Suggested-by: Florian Fainelli <f.fainelli@...il.com>
Signed-off-by: Neil Armstrong <narmstrong@...libre.com>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists