Commit 6053bbf7 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

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: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc44578b
...@@ -2733,7 +2733,8 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event, ...@@ -2733,7 +2733,8 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event,
cnic_ulp_init(dev); cnic_ulp_init(dev);
else if (event == NETDEV_UNREGISTER) else if (event == NETDEV_UNREGISTER)
cnic_ulp_exit(dev); cnic_ulp_exit(dev);
else if (event == NETDEV_UP) {
if (event == NETDEV_UP) {
if (cnic_register_netdev(dev) != 0) { if (cnic_register_netdev(dev) != 0) {
cnic_put(dev); cnic_put(dev);
goto done; goto done;
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#ifndef CNIC_IF_H #ifndef CNIC_IF_H
#define CNIC_IF_H #define CNIC_IF_H
#define CNIC_MODULE_VERSION "2.0.0" #define CNIC_MODULE_VERSION "2.0.1"
#define CNIC_MODULE_RELDATE "May 21, 2009" #define CNIC_MODULE_RELDATE "Oct 01, 2009"
#define CNIC_ULP_RDMA 0 #define CNIC_ULP_RDMA 0
#define CNIC_ULP_ISCSI 1 #define CNIC_ULP_ISCSI 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment