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

Commit 62ac0dc9 authored Nov 13, 2011 by Dmitry Kravkov Committed by David S. Miller Nov 13, 2011

bnx2x: allow FCoE and DCB for 578xx



Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6589ade0

drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -923,7 +923,7 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,

	void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled)		void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled)
	{		{
	if (!CHIP_IS_E1x(bp) && !CHIP_IS_E3(bp)) {		if (!CHIP_IS_E1x(bp)) {
	bp->dcb_state = dcb_on;		bp->dcb_state = dcb_on;
	bp->dcbx_enabled = dcbx_enabled;		bp->dcbx_enabled = dcbx_enabled;
	} else {		} else {

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10817,8 +10817,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
	bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);		bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);

	#ifdef BCM_CNIC		#ifdef BCM_CNIC
	/* disable FCOE L2 queue for E1x and E3*/		/* disable FCOE L2 queue for E1x */
	if (CHIP_IS_E1x(bp) \|\| CHIP_IS_E3(bp))		if (CHIP_IS_E1x(bp))
	bp->flags \|= NO_FCOE_FLAG;		bp->flags \|= NO_FCOE_FLAG;

	#endif		#endif