AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 10:45:23 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: dpaa2-ethsw: move port notifier per ethsw

Browse Source 
Register a different net_device notifier block per ethsw instance.
When probing multiple dpaa2-ethsw instances, without this the register
will fail.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Link: https://lore.kernel.org/r/1573491058-24766-2-git-send-email-ioana.ciornei@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ioana Ciornei 2019-11-11 18:50:55 +02:00 committed by Greg Kroah-Hartman
parent 7db57ca4b1
commit c5e648f857
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/fsl-dpaa2/ethsw/ethsw.c
View File

@ -1174,10 +1174,6 @@ static int port_netdevice_event(struct notifier_block *unused,
return notifier_from_errno(err);
}
static struct notifier_block port_nb __read_mostly = {
.notifier_call = port_netdevice_event,
};
struct ethsw_switchdev_event_work {
struct work_struct work;
struct switchdev_notifier_fdb_info fdb_info;
@ -1328,9 +1324,11 @@ static struct notifier_block port_switchdev_blocking_nb = {
static int ethsw_register_notifier(struct device *dev)
{
struct ethsw_core *ethsw = dev_get_drvdata(dev);
int err;
err = register_netdevice_notifier(&port_nb);
ethsw->port_nb.notifier_call = port_netdevice_event;
err = register_netdevice_notifier(&ethsw->port_nb);
if (err) {
dev_err(dev, "Failed to register netdev notifier\n");
return err;
@ -1353,7 +1351,7 @@ static int ethsw_register_notifier(struct device *dev)
err_switchdev_blocking_nb:
unregister_switchdev_notifier(&port_switchdev_nb);
err_switchdev_nb:
unregister_netdevice_notifier(&port_nb);
unregister_netdevice_notifier(&ethsw->port_nb);
return err;
}
@ -1491,6 +1489,7 @@ static int ethsw_port_init(struct ethsw_port_priv *port_priv, u16 port)
static void ethsw_unregister_notifier(struct device *dev)
{
struct ethsw_core *ethsw = dev_get_drvdata(dev);
struct notifier_block *nb;
int err;
@ -1505,7 +1504,7 @@ static void ethsw_unregister_notifier(struct device *dev)
dev_err(dev,
"Failed to unregister switchdev notifier (%d)\n", err);
err = unregister_netdevice_notifier(&port_nb);
err = unregister_netdevice_notifier(&ethsw->port_nb);
if (err)
dev_err(dev,
"Failed to unregister netdev notifier (%d)\n", err);

2
drivers/staging/fsl-dpaa2/ethsw/ethsw.h
View File

@ -66,6 +66,8 @@ struct ethsw_core {
u8 vlans[VLAN_VID_MASK + 1];
bool learning;
struct notifier_block port_nb;
};
#endif /* __ETHSW_H */