From: Michael Chan <mchan@broadcom.com>
Date: Tue, 15 Jun 2010 08:57:00 +0000 (+0000)
Subject: cnic: Return error code in cnic_cm_close() if unsuccessful.
X-Git-Tag: v2.6.36-rc1~571^2~575
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ed99daa5a0de4df9ed579ce36ff8b1373b6dbe47;p=~emulex%2Finfiniband.git

cnic: Return error code in cnic_cm_close() if unsuccessful.

So that bnx2i can handle the error condition immediately and not have to
wait for timeout.

Signed-off-by: Michael Chan <mchan@broadcom.com.
Signed-off-by: Eddie Wai <waie@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 908d89a4fe8..b20e11cf561 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -3026,6 +3026,8 @@ static int cnic_cm_close(struct cnic_sock *csk)
 	if (cnic_close_prep(csk)) {
 		csk->state = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
 		return cnic_cm_close_req(csk);
+	} else {
+		return -EALREADY;
 	}
 	return 0;
 }