net: lan966x: Flush fdb workqueue when port is leaving a bridge.

Whenever a port leaves a bridge, flush the workqueue of the FDB work.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c b/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
index c760f73c0621551e3aea7fb3570a3dae7b398735..5142e7c0de3124c2fe33d5274ca5c403ee01435e 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
@@ -128,6 +128,11 @@ void lan966x_fdb_deinit(struct lan966x *lan966x)
        lan966x_fdb_purge_entries(lan966x);
 }
 
+void lan966x_fdb_flush_workqueue(struct lan966x *lan966x)
+{
+       flush_workqueue(lan966x->fdb_work);
+}
+
 static void lan966x_fdb_port_event_work(struct lan966x_fdb_event_work *fdb_work)
 {
        struct switchdev_notifier_fdb_info *fdb_info;
@@ -205,8 +210,6 @@ static void lan966x_fdb_event_work(struct work_struct *work)
                lan966x_fdb_bridge_event_work(fdb_work);
 
        kfree(fdb_work->fdb_info.addr);
-       dev_put(fdb_work->dev);
-       dev_put(fdb_work->orig_dev);
        kfree(fdb_work);
 }
 
@@ -244,8 +247,6 @@ int lan966x_handle_fdb(struct net_device *dev,
                        goto err_addr_alloc;
 
                ether_addr_copy((u8 *)fdb_work->fdb_info.addr, fdb_info->addr);
-               dev_hold(dev);
-               dev_hold(orig_dev);
 
                queue_work(lan966x->fdb_work, &fdb_work->work);
                break;

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
index 2787055c1847535c09a1eb5a3086ffe42305b3ea..b02c1c803945640368a62f0fda5c88edaf971883 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
@@ -369,6 +369,7 @@ void lan966x_fdb_write_entries(struct lan966x *lan966x, u16 vid);
 void lan966x_fdb_erase_entries(struct lan966x *lan966x, u16 vid);
 int lan966x_fdb_init(struct lan966x *lan966x);
 void lan966x_fdb_deinit(struct lan966x *lan966x);
+void lan966x_fdb_flush_workqueue(struct lan966x *lan966x);
 int lan966x_handle_fdb(struct net_device *dev,
                       struct net_device *orig_dev,
                       unsigned long event, const void *ctx,

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c b/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c
index df2bee6785598ac0fb5b2eade1a99d2223e9da79..d9fc6a9a3da142c384929fd5f6eb26faa851e6be 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c
@@ -320,9 +320,10 @@ static int lan966x_port_prechangeupper(struct net_device *dev,
 {
        struct lan966x_port *port = netdev_priv(dev);
 
-       if (netif_is_bridge_master(info->upper_dev) && !info->linking)
-               switchdev_bridge_port_unoffload(port->dev, port,
-                                               NULL, NULL);
+       if (netif_is_bridge_master(info->upper_dev) && !info->linking) {
+               switchdev_bridge_port_unoffload(port->dev, port, NULL, NULL);
+               lan966x_fdb_flush_workqueue(port->lan966x);
+       }
 
        return NOTIFY_DONE;
 }