Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1285283

[PATCH v3 net-next 2/4] net: dsa: cleanup resources upon module removal

Show all headers | View raw

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>
---
 net/dsa/dsa.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 0f41f71..d9e0172 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -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];
 
-- 
1.9.1

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 net-next 0/4] Further fix for dsa unbinding Neil Armstrong <narmstrong@baylibre.com> - 2015-12-07 14:00 +0100
  [PATCH v3 net-next 2/4] net: dsa: cleanup resources upon module removal Neil Armstrong <narmstrong@baylibre.com> - 2015-12-07 14:00 +0100
  [PATCH v3 net-next 4/4] net: dsa: move dsa slave destroy code to slave.c Neil Armstrong <narmstrong@baylibre.com> - 2015-12-07 14:10 +0100
  [PATCH v3 net-next 1/4] net: dsa: remove DSA link polling Neil Armstrong <narmstrong@baylibre.com> - 2015-12-07 14:10 +0100
  Re: [PATCH v3 net-next 0/4] Further fix for dsa unbinding Andrew Lunn <andrew@lunn.ch> - 2015-12-07 15:30 +0100
  Re: [PATCH v3 net-next 0/4] Further fix for dsa unbinding Florian Fainelli <f.fainelli@gmail.com> - 2015-12-07 21:40 +0100
  Re: [PATCH v3 net-next 0/4] Further fix for dsa unbinding David Miller <davem@davemloft.net> - 2015-12-07 22:40 +0100

csiph-web