mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From eaa34bd4f7b5e505c6c211cb906f6a2ce2242e4c Mon Sep 17 00:00:00 2001
|
|
From: Claudiu Manoil <claudiu.manoil@nxp.com>
|
|
Date: Thu, 25 Jul 2019 16:33:18 +0300
|
|
Subject: [PATCH 800/826] ocelot: Cancel delayed work before wq destruction
|
|
|
|
[ Upstream commit c5d139697d5d9ecf9c7cd92d7d7838a173508900 ]
|
|
|
|
Make sure the delayed work for stats update is not pending before
|
|
wq destruction.
|
|
This fixes the module unload path.
|
|
The issue is there since day 1.
|
|
|
|
Fixes: a556c76adc05 ("net: mscc: Add initial Ocelot switch support")
|
|
|
|
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
|
|
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/net/ethernet/mscc/ocelot.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
|
|
index 10291198decd..732ba21d3369 100644
|
|
--- a/drivers/net/ethernet/mscc/ocelot.c
|
|
+++ b/drivers/net/ethernet/mscc/ocelot.c
|
|
@@ -1767,6 +1767,7 @@ EXPORT_SYMBOL(ocelot_init);
|
|
|
|
void ocelot_deinit(struct ocelot *ocelot)
|
|
{
|
|
+ cancel_delayed_work(&ocelot->stats_work);
|
|
destroy_workqueue(ocelot->stats_queue);
|
|
mutex_destroy(&ocelot->stats_lock);
|
|
}
|
|
--
|
|
2.22.0
|
|
|