mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
net/af_iucv: always register net_device notifier
[ Upstream commit06996c1d40
] Even when running as VM guest (ie pr_iucv != NULL), af_iucv can still open HiperTransport-based connections. For robust operation these connections require the af_iucv_netdev_notifier, so register it unconditionally. Also handle any error that register_netdevice_notifier() returns. Fixes:9fbd87d413
("af_iucv: handle netdev events") Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Reviewed-by: Ursula Braun <ubraun@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
9cbefb0fde
commit
b977cc31da
1 changed files with 20 additions and 7 deletions
|
@ -2465,6 +2465,13 @@ static int afiucv_iucv_init(void)
|
|||
return err;
|
||||
}
|
||||
|
||||
static void afiucv_iucv_exit(void)
|
||||
{
|
||||
device_unregister(af_iucv_dev);
|
||||
driver_unregister(&af_iucv_driver);
|
||||
pr_iucv->iucv_unregister(&af_iucv_handler, 0);
|
||||
}
|
||||
|
||||
static int __init afiucv_init(void)
|
||||
{
|
||||
int err;
|
||||
|
@ -2498,11 +2505,18 @@ static int __init afiucv_init(void)
|
|||
err = afiucv_iucv_init();
|
||||
if (err)
|
||||
goto out_sock;
|
||||
} else
|
||||
register_netdevice_notifier(&afiucv_netdev_notifier);
|
||||
}
|
||||
|
||||
err = register_netdevice_notifier(&afiucv_netdev_notifier);
|
||||
if (err)
|
||||
goto out_notifier;
|
||||
|
||||
dev_add_pack(&iucv_packet_type);
|
||||
return 0;
|
||||
|
||||
out_notifier:
|
||||
if (pr_iucv)
|
||||
afiucv_iucv_exit();
|
||||
out_sock:
|
||||
sock_unregister(PF_IUCV);
|
||||
out_proto:
|
||||
|
@ -2516,12 +2530,11 @@ static int __init afiucv_init(void)
|
|||
static void __exit afiucv_exit(void)
|
||||
{
|
||||
if (pr_iucv) {
|
||||
device_unregister(af_iucv_dev);
|
||||
driver_unregister(&af_iucv_driver);
|
||||
pr_iucv->iucv_unregister(&af_iucv_handler, 0);
|
||||
afiucv_iucv_exit();
|
||||
symbol_put(iucv_if);
|
||||
} else
|
||||
unregister_netdevice_notifier(&afiucv_netdev_notifier);
|
||||
}
|
||||
|
||||
unregister_netdevice_notifier(&afiucv_netdev_notifier);
|
||||
dev_remove_pack(&iucv_packet_type);
|
||||
sock_unregister(PF_IUCV);
|
||||
proto_unregister(&iucv_proto);
|
||||
|
|
Loading…
Reference in a new issue