Skip to content

Commit

Permalink
cnic: Handle RAMROD_CMD_ID_CLOSE error.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eddie Wai authored and David S. Miller committed Jun 28, 2012
1 parent 1f85d58 commit 7bc910f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions drivers/net/ethernet/broadcom/cnic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/broadcom/cnic_if.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7bc910f

Please sign in to comment.