Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bc910fd authored by Eddie Wai's avatar Eddie Wai Committed by David S. Miller
Browse files

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: default avatarEddie Wai <eddie.wai@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f85d58c

drivers/net/ethernet/broadcom/cnic.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -3953,6 +3953,15 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe) 
		cnic_cm_upcall(cp, csk, opcode);

		cnic_cm_upcall(cp, csk, opcode);

		break;

		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_RESET_RECEIVED:

	case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:

	case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:

	case L4_KCQE_OPCODE_VALUE_RESET_COMP:

	case L4_KCQE_OPCODE_VALUE_RESET_COMP:

drivers/net/ethernet/broadcom/cnic_if.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -14,8 +14,8 @@ 




#include "bnx2x/bnx2x_mfw_req.h"

#include "bnx2x/bnx2x_mfw_req.h"





#define CNIC_MODULE_VERSION	"2.5.10"

#define CNIC_MODULE_VERSION	"2.5.11"

#define CNIC_MODULE_RELDATE	"March 21, 2012"

#define CNIC_MODULE_RELDATE	"June 27, 2012"





#define CNIC_ULP_RDMA		0

#define CNIC_ULP_RDMA		0

#define CNIC_ULP_ISCSI		1

#define CNIC_ULP_ISCSI		1