bnx2x: do not allocate FCoE ring if disabled (8eef2af1) · Commits · 戴 / test

Signed-off-by:

drivers/net/bnx2x/bnx2x_cmn.c

+13 −4

Original line number	Diff line number	Diff line
		@@ -2621,6 +2621,11 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
		#ifdef BCM_CNIC
		}
		#endif

		/* FCoE Queue uses Default SB and doesn't ACK the SB, thus no need to
		* set shortcuts for it.
		*/
		if (!IS_FCOE_IDX(index))
		set_sb_shortcuts(bp, index);

		/* Tx */
		@@ -2698,8 +2703,12 @@ int bnx2x_alloc_fp_mem(struct bnx2x *bp)
		if (bnx2x_alloc_fp_mem_at(bp, 0))
		return -ENOMEM;
		#ifdef BCM_CNIC
		if (!NO_FCOE(bp))
		/* FCoE */
		if (bnx2x_alloc_fp_mem_at(bp, FCOE_IDX))
		/* we will fail load process instead of mark
		* NO_FCOE_FLAG
		*/
		return -ENOMEM;
		#endif
		/* RSS */