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

Commit db1d350f authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

cnic: Improve NETDEV_UP event handling 



During NETDEV_UP, we use symbol_get() to get the net driver's cnic
probe function.  This sometimes doesn't work if NETDEV_UP happens
right after NETDEV_REGISTER and the net driver is still running module
init code.  As a result, the cnic device may not be discovered.  We
fix this by probing on all NETDEV events if the device's netif_running
state is up.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 11f23aa8

drivers/net/cnic.c

+2 −2
Original line number Diff line number Diff line
@@ -5342,7 +5342,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event, 


	dev = cnic_from_netdev(netdev);



	if (!dev && (event == NETDEV_REGISTER || event == NETDEV_UP)) {

	if (!dev && (event == NETDEV_REGISTER || netif_running(netdev))) {

		/* Check for the hot-plug device */

		dev = is_cnic_dev(netdev);

		if (dev) {
@@ -5358,7 +5358,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event, 
		else if (event == NETDEV_UNREGISTER)

			cnic_ulp_exit(dev);



		if (event == NETDEV_UP) {

		if (event == NETDEV_UP || (new_dev && netif_running(netdev))) {

			if (cnic_register_netdev(dev) != 0) {

				cnic_put(dev);

				goto done;