From: Michael Chan Date: Sat, 22 Apr 2017 00:11:25 +0000 (-0400) Subject: bnxt_en: Check the FW_LLDP_AGENT flag before allowing DCBX host agent. X-Git-Tag: v4.1.12-106.0.20170710_2300~33 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=650c865dd2f1517ec596461907a5cdb630f83d79;p=users%2Fjedix%2Flinux-maple.git bnxt_en: Check the FW_LLDP_AGENT flag before allowing DCBX host agent. Orabug: 26402533, 26325599, 26366387 Check the additional flag in bnxt_hwrm_func_qcfg() before allowing DCBX to be done in host mode. Signed-off-by: Michael Chan Signed-off-by: David S. Miller (cherry picked from commit 7d63818a35851cf00867248d5ab50a8fe8df5943) Signed-off-by: Brian Maly Signed-off-by: Somasundaram Krishnasamy --- diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 1e3f1988c0d30..d0d5ba9dba5e0 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4511,7 +4511,8 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp) } #endif if (BNXT_PF(bp) && (le16_to_cpu(resp->flags) & - FUNC_QCFG_RESP_FLAGS_FW_DCBX_AGENT_ENABLED)) + (FUNC_QCFG_RESP_FLAGS_FW_DCBX_AGENT_ENABLED | + FUNC_QCFG_RESP_FLAGS_FW_LLDP_AGENT_ENABLED))) bp->flags |= BNXT_FLAG_FW_LLDP_AGENT; switch (resp->port_partition_type) {