summaryrefslogtreecommitdiffstats
path: root/drivers/net/cnic.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2009-10-02 11:03:28 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-02 11:03:28 -0700
commit6053bbf7bbdbb2c94547f830ad07636c17d7024e (patch)
treea72a2f61c86e65e2dcd076433c130ebc67384fed /drivers/net/cnic.c
parentcc44578b5a508889beb8ae3ccd4d2bbdf17bc86c (diff)
downloadop-kernel-dev-6053bbf7bbdbb2c94547f830ad07636c17d7024e.zip
op-kernel-dev-6053bbf7bbdbb2c94547f830ad07636c17d7024e.tar.gz
cnic: Fix NETDEV_UP event processing.
This fixes the problem of not handling the NETDEV_UP event properly during hot-plug or modprobe of bnx2 after cnic. The handling was skipped by mistakenly using "else if" to check for the event. Also update version to 2.0.1. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cnic.c')
-rw-r--r--drivers/net/cnic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 211c8e9..46c87ec 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -2733,7 +2733,8 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event,
cnic_ulp_init(dev);
else if (event == NETDEV_UNREGISTER)
cnic_ulp_exit(dev);
- else if (event == NETDEV_UP) {
+
+ if (event == NETDEV_UP) {
if (cnic_register_netdev(dev) != 0) {
cnic_put(dev);
goto done;
OpenPOWER on IntegriCloud