From 914e768f85bb833ca10f5e22496a86833e211318 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Mon, 3 Jan 2011 15:21:46 +0000
Subject: [PATCH] --- yaml --- r: 225457 b: refs/heads/master c:
 42bb8d56953a06de50941d6d3df89dc3023bb92d h: refs/heads/master i:   225455:
 f3f090faddb2ae0854e74f6c9dc54a69b2540844 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/cnic.c    | 19 +++----------------
 trunk/drivers/net/cnic_if.h |  6 +++---
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 94c31ddd6922..239000fd30bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57045c996fb4e035f1d152b7e04315fc223352e9
+refs/heads/master: 42bb8d56953a06de50941d6d3df89dc3023bb92d
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
index 41957fa2d010..6dfa56440ac0 100644
--- a/trunk/drivers/net/cnic.c
+++ b/trunk/drivers/net/cnic.c
@@ -426,19 +426,6 @@ static int cnic_abort_prep(struct cnic_sock *csk)
 	return 0;
 }
 
-static void cnic_uio_stop(void)
-{
-	struct cnic_dev *dev;
-
-	read_lock(&cnic_dev_lock);
-	list_for_each_entry(dev, &cnic_dev_list, list) {
-		struct cnic_local *cp = dev->cnic_priv;
-
-		cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
-	}
-	read_unlock(&cnic_dev_lock);
-}
-
 int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops)
 {
 	struct cnic_dev *dev;
@@ -510,9 +497,6 @@ int cnic_unregister_driver(int ulp_type)
 	}
 	read_unlock(&cnic_dev_lock);
 
-	if (ulp_type == CNIC_ULP_ISCSI)
-		cnic_uio_stop();
-
 	rcu_assign_pointer(cnic_ulp_tbl[ulp_type], NULL);
 
 	mutex_unlock(&cnic_lock);
@@ -596,6 +580,9 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)
 	}
 	mutex_unlock(&cnic_lock);
 
+	if (ulp_type == CNIC_ULP_ISCSI)
+		cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
+
 	synchronize_rcu();
 
 	while (test_bit(ULP_F_CALL_PENDING, &cp->ulp_flags[ulp_type]) &&
diff --git a/trunk/drivers/net/cnic_if.h b/trunk/drivers/net/cnic_if.h
index ccd814068c4d..9f44e0ffe003 100644
--- a/trunk/drivers/net/cnic_if.h
+++ b/trunk/drivers/net/cnic_if.h
@@ -1,6 +1,6 @@
 /* cnic_if.h: Broadcom CNIC core network driver.
  *
- * Copyright (c) 2006-2010 Broadcom Corporation
+ * Copyright (c) 2006-2011 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION	"2.2.11"
-#define CNIC_MODULE_RELDATE	"Dec 22, 2010"
+#define CNIC_MODULE_VERSION	"2.2.12"
+#define CNIC_MODULE_RELDATE	"Jan 03, 2011"
 
 #define CNIC_ULP_RDMA		0
 #define CNIC_ULP_ISCSI		1