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

Commit b37a41e3 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

cnic: Fix Context ID space calculation 



Include FCoE CID space only for E2_PLUS devices.  Remove old CID
offset adjustments that are no longer needed.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bda18faf

drivers/net/cnic.c

+1 −9
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev) 


	cp->iro_arr = ethdev->iro_arr;



	cp->max_cid_space = MAX_ISCSI_TBL_SZ + BNX2X_FCOE_NUM_CONNECTIONS;

	cp->max_cid_space = MAX_ISCSI_TBL_SZ;

	cp->iscsi_start_cid = start_cid;

	cp->fcoe_start_cid = start_cid + MAX_ISCSI_TBL_SZ;
@@ -1183,14 +1183,6 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev) 
			cp->fcoe_init_cid = 0x10;

	}



	if (start_cid < BNX2X_ISCSI_START_CID) {

		u32 delta = BNX2X_ISCSI_START_CID - start_cid;



		cp->iscsi_start_cid = BNX2X_ISCSI_START_CID;

		cp->fcoe_start_cid += delta;

		cp->max_cid_space += delta;

	}



	cp->iscsi_tbl = kzalloc(sizeof(struct cnic_iscsi) * MAX_ISCSI_TBL_SZ,

				GFP_KERNEL);

	if (!cp->iscsi_tbl)