Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06996c1d authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

net/af_iucv: always register net_device notifier 



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: 9fbd87d4 ("af_iucv: handle netdev events")
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 238965b7

net/iucv/af_iucv.c

+20 −7
Original line number Diff line number Diff line
@@ -2440,6 +2440,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;
@@ -2473,11 +2480,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:
@@ -2491,11 +2505,10 @@ 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);

	dev_remove_pack(&iucv_packet_type);

	sock_unregister(PF_IUCV);