From e57fd8b972f6576f7c273ccf4a1ed070e5926f92 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 8 Jun 2011 19:29:35 +0000 Subject: [PATCH] --- yaml --- r: 255471 b: refs/heads/master c: db1d350fcb156b58f66a67680617077bcacfe6fc h: refs/heads/master i: 255469: 20c72bf7320d8776a7f831789d4225e1db07a933 255467: 800637ad5c63e0469e17decbb10bdd08efdb103a 255463: c7d7adce58fcaf986968aba7f9e27e36bcd334e9 255455: be6182b5d964faa912eedb41d90c131ebda72876 v: v3 --- [refs] | 2 +- trunk/drivers/net/cnic.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a8aaa1dfc03b..4315fc2dce6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11f23aa8ccd56786f0a6f04211cf59b3fab2ce08 +refs/heads/master: db1d350fcb156b58f66a67680617077bcacfe6fc diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c index a529bde03c56..6c544b3411fa 100644 --- a/trunk/drivers/net/cnic.c +++ b/trunk/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;