From 91109979e01f662a8e9708f95ed2eb7e4d642354 Mon Sep 17 00:00:00 2001
From: Eddie Wai <eddie.wai@broadcom.com>
Date: Tue, 23 Nov 2010 15:29:26 -0800
Subject: [PATCH] --- yaml --- r: 226775 b: refs/heads/master c:
 7a2962c77ced218faeeb7b5eda48abfebc578df2 h: refs/heads/master i:   226773:
 87205449516561d0fbc96f65da08004f98515609   226771:
 b6e682515d976c891183aff816ba04a2ed55df7d   226767:
 17561940fd5c2ad83cf2d65aefb12baf3fe1e398 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0247f45ff4a5..a18084a5cbf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 252e44805bcfff5de2e05dd126f69a18e0b760f0
+refs/heads/master: 7a2962c77ced218faeeb7b5eda48abfebc578df2
diff --git a/trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c b/trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c
index a2c9b1f2ea5c..07dd4f9036f0 100644
--- a/trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1461,21 +1461,28 @@ static int bnx2i_conn_get_param(struct iscsi_cls_conn *cls_conn,
 	struct bnx2i_conn *bnx2i_conn = conn->dd_data;
 	int len = 0;
 
+	if (!(bnx2i_conn && bnx2i_conn->ep && bnx2i_conn->ep->hba))
+		goto out;
+
 	switch (param) {
 	case ISCSI_PARAM_CONN_PORT:
-		if (bnx2i_conn->ep)
+		mutex_lock(&bnx2i_conn->ep->hba->net_dev_lock);
+		if (bnx2i_conn->ep->cm_sk)
 			len = sprintf(buf, "%hu\n",
 				      bnx2i_conn->ep->cm_sk->dst_port);
+		mutex_unlock(&bnx2i_conn->ep->hba->net_dev_lock);
 		break;
 	case ISCSI_PARAM_CONN_ADDRESS:
-		if (bnx2i_conn->ep)
+		mutex_lock(&bnx2i_conn->ep->hba->net_dev_lock);
+		if (bnx2i_conn->ep->cm_sk)
 			len = sprintf(buf, "%pI4\n",
 				      &bnx2i_conn->ep->cm_sk->dst_ip);
+		mutex_unlock(&bnx2i_conn->ep->hba->net_dev_lock);
 		break;
 	default:
 		return iscsi_conn_get_param(cls_conn, param, buf);
 	}
-
+out:
 	return len;
 }