cnic: Handle RAMROD_CMD_ID_CLOSE error.

If firmware returns error status, proceed to close the iSCSI connection.
Update version to 2.5.11.

(backported from upstream commit 7bc910fd8f953c131de055d9871679a598db8dc6)
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 97543bad81e740093f96101d2ae44bfde3811705..cf23f282cee9d90dbde4fb7c0c17a19b138b1d31 100644 (file)
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -3946,6 +3946,15 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)
                cnic_cm_upcall(cp, csk, opcode);
                break;
 
+       case L5CM_RAMROD_CMD_ID_CLOSE:
+               if (l4kcqe->status != 0) {
+                       netdev_warn(dev->netdev, "RAMROD CLOSE compl with "
+                                   "status 0x%x\n", l4kcqe->status);
+                       opcode = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
+                       /* Fall through */
+               } else {
+                       break;
+               }
        case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
        case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
        case L4_KCQE_OPCODE_VALUE_RESET_COMP:

diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 289274e546beea4346181a2252794627eba5fd7e..3b473253ecbfbab2f437c5d02592d6824f4f0f16 100644 (file)
--- 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.5.10"
-#define CNIC_MODULE_RELDATE    "March 21, 2012"
+#define CNIC_MODULE_VERSION    "2.5.11"
+#define CNIC_MODULE_RELDATE    "June 27, 2012"
 
 #define CNIC_ULP_RDMA          0
 #define CNIC_ULP_ISCSI         1