openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: dpaa2-ethsw: move port switchdev notifier per ethsw 

Register a different switchdev 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-3-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:56 +02:00 committed by Greg Kroah-Hartman
parent c5e648f857
commit a3c6345e9f
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1314,10 +1314,6 @@ static int port_switchdev_blocking_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
static struct notifier_block port_switchdev_nb = {
.notifier_call = port_switchdev_event,
};
static struct notifier_block port_switchdev_blocking_nb = {
.notifier_call = port_switchdev_blocking_event,
};
@ -1334,7 +1330,8 @@ static int ethsw_register_notifier(struct device *dev)
return err;
}
err = register_switchdev_notifier(&port_switchdev_nb);
ethsw->port_switchdev_nb.notifier_call = port_switchdev_event;
err = register_switchdev_notifier(&ethsw->port_switchdev_nb);
if (err) {
dev_err(dev, "Failed to register switchdev notifier\n");
goto err_switchdev_nb;
@ -1349,7 +1346,7 @@ static int ethsw_register_notifier(struct device *dev)
return 0;
err_switchdev_blocking_nb:
unregister_switchdev_notifier(&port_switchdev_nb);
unregister_switchdev_notifier(&ethsw->port_switchdev_nb);
err_switchdev_nb:
unregister_netdevice_notifier(&ethsw->port_nb);
return err;
@ -1499,7 +1496,7 @@ static void ethsw_unregister_notifier(struct device *dev)
dev_err(dev,
"Failed to unregister switchdev blocking notifier (%d)\n", err);
err = unregister_switchdev_notifier(&port_switchdev_nb);
err = unregister_switchdev_notifier(&ethsw->port_switchdev_nb);
if (err)
dev_err(dev,
"Failed to unregister switchdev notifier (%d)\n", err);

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

@ -68,6 +68,7 @@ struct ethsw_core {
bool learning;
struct notifier_block port_nb;
struct notifier_block port_switchdev_nb;
};
#endif /* __ETHSW_H */