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.
Unified · Split
| @@ -239,13 +239,19 @@ void bnx2x_int_disable(struct bnx2x *bp); · 238 unmodified lines | ||
| 239 | 239 | * FUNC_N_CLID_X = N * NUM_SPECIAL_CLIENTS + FUNC_0_CLID_X |
| 240 | 240 | * |
| 241 | 241 | */ |
| 242 | −/* iSCSI L2 */ | |
| 243 | −#define BNX2X_ISCSI_ETH_CL_ID_IDX 1 | |
| 244 | −#define BNX2X_ISCSI_ETH_CID 49 | |
| 242 | +enum { | |
| 243 | + BNX2X_ISCSI_ETH_CL_ID_IDX, | |
| 244 | + BNX2X_FCOE_ETH_CL_ID_IDX, | |
| 245 | + BNX2X_MAX_CNIC_ETH_CL_ID_IDX, | |
| 246 | +}; | |
| 245 | 247 | |
| 246 | −/* FCoE L2 */ | |
| 247 | −#define BNX2X_FCOE_ETH_CL_ID_IDX 2 | |
| 248 | −#define BNX2X_FCOE_ETH_CID 50 | |
| 248 | +#define BNX2X_CNIC_START_ETH_CID 48 | |
| 249 | +enum { | |
| 250 | + /* iSCSI L2 */ | |
| 251 | + BNX2X_ISCSI_ETH_CID = BNX2X_CNIC_START_ETH_CID, | |
| 252 | + /* FCoE L2 */ | |
| 253 | + BNX2X_FCOE_ETH_CID, | |
| 254 | +}; | |
| 249 | 255 | |
| 250 | 256 | /** Additional rings budgeting */ |
| 251 | 257 | #ifdef BCM_CNIC |
| @@ -1297,7 +1297,7 @@ static inline void bnx2x_init_txdata(struct bnx2x *bp, · 1296 unmodified lines | ||
| 1297 | 1297 | static inline u8 bnx2x_cnic_eth_cl_id(struct bnx2x *bp, u8 cl_idx) |
| 1298 | 1298 | { |
| 1299 | 1299 | return bp->cnic_base_cl_id + cl_idx + |
| 1300 | − (bp->pf_num >> 1) * NON_ETH_CONTEXT_USE; | |
| 1300 | + (bp->pf_num >> 1) * BNX2X_MAX_CNIC_ETH_CL_ID_IDX; | |
| 1301 | 1301 | } |
| 1302 | 1302 | |
| 1303 | 1303 | static inline u8 bnx2x_cnic_fw_sb_id(struct bnx2x *bp) |