diff options
| author | Michael Chan <mchan@broadcom.com> | 2011-06-08 19:29:35 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:41:05 -0700 |
| commit | 53a3c0032ef51439ea2ff9f583706ce8a7055c96 (patch) | |
| tree | 35a1d5c50e2afe95c2615c28791390e360788fae /drivers | |
| parent | d66f95d5b0a66910ae7d5442a4625bf510de9805 (diff) | |
| download | kernel_samsung_smdk4412-53a3c0032ef51439ea2ff9f583706ce8a7055c96.zip kernel_samsung_smdk4412-53a3c0032ef51439ea2ff9f583706ce8a7055c96.tar.gz kernel_samsung_smdk4412-53a3c0032ef51439ea2ff9f583706ce8a7055c96.tar.bz2 | |
cnic: Improve NETDEV_UP event handling
commit db1d350fcb156b58f66a67680617077bcacfe6fc upstream.
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: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/cnic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index a529bde..6c544b3 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c @@ -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; |