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

Commit f917174c authored May 17, 2017 by David S. Miller

Merge branch 'bnxt_en-DCBX-fixes'



Michael Chan says:

====================
bnxt_en: DCBX fixes.

2 bug fixes for the case where the NIC's firmware DCBX agent is enabled.
With these fixes, we will return the proper information to lldpad.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 9142e900 f667724b

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -7630,8 +7630,6 @@ static int bnxt_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		dev->min_mtu = ETH_ZLEN;
		dev->max_mtu = BNXT_MAX_MTU;

		bnxt_dcb_init(bp);

		#ifdef CONFIG_BNXT_SRIOV
		init_waitqueue_head(&bp->sriov_cfg_wait);
		#endif
		@@ -7669,6 +7667,7 @@ static int bnxt_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		bnxt_hwrm_func_qcfg(bp);
		bnxt_hwrm_port_led_qcaps(bp);
		bnxt_ethtool_init(bp);
		bnxt_dcb_init(bp);

		bnxt_set_rx_skb_mode(bp, false);
		bnxt_set_tpa_flags(bp);

drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -553,8 +553,10 @@ static u8 bnxt_dcbnl_setdcbx(struct net_device *dev, u8 mode)
		if ((mode & DCB_CAP_DCBX_VER_CEE) \|\| !(mode & DCB_CAP_DCBX_VER_IEEE))
		return 1;

		if ((mode & DCB_CAP_DCBX_HOST) && BNXT_VF(bp))
		if (mode & DCB_CAP_DCBX_HOST) {
		if (BNXT_VF(bp) \|\| (bp->flags & BNXT_FLAG_FW_LLDP_AGENT))
		return 1;
		}

		if (mode == bp->dcbx_cap)
		return 0;