cnic: Handle RAMROD_CMD_ID_CLOSE error.

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

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>

2 files changed, 11 insertions, 2 deletions

diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index ec43df1668c1..f897306b0eb7 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -3953,6 +3953,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/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index d63d45591c1f..54f68f07692e 100644
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
@@ -14,8 +14,8 @@
 
 #include "bnx2x/bnx2x_mfw_req.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