From 17165cb184ef2bec6db240a44f8daaefceb5478f Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Fri, 2 Oct 2009 11:03:28 -0700 Subject: [PATCH] --- yaml --- r: 166736 b: refs/heads/master c: 6053bbf7bbdbb2c94547f830ad07636c17d7024e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/cnic.c | 3 ++- trunk/drivers/net/cnic_if.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b3c69d6fb112..4f051a139938 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc44578b5a508889beb8ae3ccd4d2bbdf17bc86c +refs/heads/master: 6053bbf7bbdbb2c94547f830ad07636c17d7024e diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c index 211c8e9182fc..46c87ec7960c 100644 --- a/trunk/drivers/net/cnic.c +++ b/trunk/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/trunk/drivers/net/cnic_if.h b/trunk/drivers/net/cnic_if.h index a49235739eef..d8b09efdcb52 100644 --- a/trunk/drivers/net/cnic_if.h +++ b/trunk/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