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

Commit 134d0f97 authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: fix cl_id allocation for non-eth clients for NPAR mode 



There are some consolidations of NPAR configuration
when FCoE and iSCSI L2 clients will get the same id,
in this case FCoE ring will be non-functional.

Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5d6136e

drivers/net/bnx2x/bnx2x.h

+12 −6
Original line number Diff line number Diff line
@@ -239,13 +239,19 @@ void bnx2x_int_disable(struct bnx2x *bp); 
 *  FUNC_N_CLID_X = N * NUM_SPECIAL_CLIENTS + FUNC_0_CLID_X

 *

 */

/* iSCSI L2 */

#define BNX2X_ISCSI_ETH_CL_ID_IDX	1

#define BNX2X_ISCSI_ETH_CID		49

enum {

	BNX2X_ISCSI_ETH_CL_ID_IDX,

	BNX2X_FCOE_ETH_CL_ID_IDX,

	BNX2X_MAX_CNIC_ETH_CL_ID_IDX,

};



#define BNX2X_CNIC_START_ETH_CID	48

enum {

	/* iSCSI L2 */

	BNX2X_ISCSI_ETH_CID = BNX2X_CNIC_START_ETH_CID,

	/* FCoE L2 */

#define BNX2X_FCOE_ETH_CL_ID_IDX	2

#define BNX2X_FCOE_ETH_CID		50

	BNX2X_FCOE_ETH_CID,

};



/** Additional rings budgeting */

#ifdef BCM_CNIC

drivers/net/bnx2x/bnx2x_cmn.h

+1 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ static inline void bnx2x_init_txdata(struct bnx2x *bp, 
static inline u8 bnx2x_cnic_eth_cl_id(struct bnx2x *bp, u8 cl_idx)

{

	return bp->cnic_base_cl_id + cl_idx +

		(bp->pf_num >> 1) * NON_ETH_CONTEXT_USE;

		(bp->pf_num >> 1) * BNX2X_MAX_CNIC_ETH_CL_ID_IDX;

}



static inline u8 bnx2x_cnic_fw_sb_id(struct bnx2x *bp)