diff options
| author | Michael Chan <mchan@broadcom.com> | 2009-10-02 11:03:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-02 11:03:28 -0700 |
| commit | 6053bbf7bbdbb2c94547f830ad07636c17d7024e (patch) | |
| tree | a72a2f61c86e65e2dcd076433c130ebc67384fed /drivers/net | |
| parent | cc44578b5a508889beb8ae3ccd4d2bbdf17bc86c (diff) | |
| download | linux-6053bbf7bbdbb2c94547f830ad07636c17d7024e.tar.bz2 | |
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')
| -rw-r--r-- | drivers/net/cnic.c | 3 | ||||
| -rw-r--r-- | drivers/net/cnic_if.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 211c8e9182fc..46c87ec7960c 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; diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h index a49235739eef..d8b09efdcb52 100644 --- a/drivers/net/cnic_if.h +++ b/drivers/net/cnic_if.h @@ -12,8 +12,8 @@ #ifndef CNIC_IF_H #define CNIC_IF_H -#define CNIC_MODULE_VERSION "2.0.0" -#define CNIC_MODULE_RELDATE "May 21, 2009" +#define CNIC_MODULE_VERSION "2.0.1" +#define CNIC_MODULE_RELDATE "Oct 01, 2009" #define CNIC_ULP_RDMA 0 #define CNIC_ULP_ISCSI 1 |