Commit 656bcd5d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-isolation-prep' 



Vladimir Oltean says:

====================
DSA preparations for FDB isolation between bridges

This series makes 2 small changes to DSA's SWITCHDEV_FDB_{ADD,DEL}_TO_DEVICE
handler, which will make it possible to offer switch drivers a stable
association between a FDB entry and a bridge device in a future series.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 046178e7 425d19ce

net/dsa/port.c

+2 −0
Original line number Diff line number Diff line
@@ -380,6 +380,8 @@ void dsa_port_pre_bridge_leave(struct dsa_port *dp, struct net_device *br) 
	switchdev_bridge_port_unoffload(brport_dev, dp,

					&dsa_slave_switchdev_notifier,

					&dsa_slave_switchdev_blocking_notifier);



	dsa_flush_workqueue();

}



void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br)

net/dsa/slave.c

+0 −3
Original line number Diff line number Diff line
@@ -2448,7 +2448,6 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work) 
		break;

	}



	dev_put(switchdev_work->dev);

	kfree(switchdev_work);

}
@@ -2521,8 +2520,6 @@ static int dsa_slave_fdb_event(struct net_device *dev, 
	switchdev_work->vid = fdb_info->vid;

	switchdev_work->host_addr = host_addr;



	/* Hold a reference for dsa_fdb_offload_notify */

	dev_hold(dev);

	dsa_schedule_work(&switchdev_work->work);



	return 0;