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

cnic: Finetune iSCSI connection set up. 



Initialize IP ID and handle some additional connection errors.

Signed-off-by: default avatarEddie Wai <waie@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c85a2618

drivers/net/cnic.c

+16 −1
Original line number Original line Diff line number Diff line
@@ -2507,7 +2507,7 @@ static int cnic_cm_offload_pg(struct cnic_sock *csk) 
	l4kwqe->sa5 = dev->mac_addr[5];

	l4kwqe->sa5 = dev->mac_addr[5];





	l4kwqe->etype = ETH_P_IP;

	l4kwqe->etype = ETH_P_IP;

	l4kwqe->ipid_count = DEF_IPID_COUNT;

	l4kwqe->ipid_start = DEF_IPID_START;

	l4kwqe->host_opaque = csk->l5_cid;

	l4kwqe->host_opaque = csk->l5_cid;





	if (csk->vlan_id) {

	if (csk->vlan_id) {
@@ -3046,6 +3046,14 @@ static void cnic_cm_process_offld_pg(struct cnic_dev *dev, struct l4_kcq *kcqe) 
		clear_bit(SK_F_OFFLD_SCHED, &csk->flags);

		clear_bit(SK_F_OFFLD_SCHED, &csk->flags);

		goto done;

		goto done;

	}

	}

	/* Possible PG kcqe status:  SUCCESS, OFFLOADED_PG, or CTX_ALLOC_FAIL */

	if (kcqe->status == L4_KCQE_COMPLETION_STATUS_CTX_ALLOC_FAIL) {

		clear_bit(SK_F_OFFLD_SCHED, &csk->flags);

		cnic_cm_upcall(cp, csk,

			       L4_KCQE_OPCODE_VALUE_CONNECT_COMPLETE);

		goto done;

	}



	csk->pg_cid = kcqe->pg_cid;

	csk->pg_cid = kcqe->pg_cid;

	set_bit(SK_F_PG_OFFLD_COMPLETE, &csk->flags);

	set_bit(SK_F_PG_OFFLD_COMPLETE, &csk->flags);

	cnic_cm_conn_req(csk);

	cnic_cm_conn_req(csk);
@@ -3083,6 +3091,13 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe) 
	}

	}





	switch (opcode) {

	switch (opcode) {

	case L5CM_RAMROD_CMD_ID_TCP_CONNECT:

		if (l4kcqe->status != 0) {

			clear_bit(SK_F_OFFLD_SCHED, &csk->flags);

			cnic_cm_upcall(cp, csk,

				       L4_KCQE_OPCODE_VALUE_CONNECT_COMPLETE);

		}

		break;

	case L4_KCQE_OPCODE_VALUE_CONNECT_COMPLETE:

	case L4_KCQE_OPCODE_VALUE_CONNECT_COMPLETE:

		if (l4kcqe->status == 0)

		if (l4kcqe->status == 0)

			set_bit(SK_F_OFFLD_COMPLETE, &csk->flags);

			set_bit(SK_F_OFFLD_COMPLETE, &csk->flags);

drivers/net/cnic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ struct cnic_redirect_entry { 
#define BNX2X_KWQ_DATA(cp, x)						\

#define BNX2X_KWQ_DATA(cp, x)						\

	&(cp)->kwq_16_data[BNX2X_KWQ_DATA_PG(cp, x)][BNX2X_KWQ_DATA_IDX(cp, x)]

	&(cp)->kwq_16_data[BNX2X_KWQ_DATA_PG(cp, x)][BNX2X_KWQ_DATA_IDX(cp, x)]





#define DEF_IPID_COUNT		0xc001

#define DEF_IPID_START		0x8000





#define DEF_KA_TIMEOUT		10000

#define DEF_KA_TIMEOUT		10000

#define DEF_KA_INTERVAL		300000

#define DEF_KA_INTERVAL		300000