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 <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 7d63818a35851cf00867248d5ab50a8fe8df5943)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 1e3f1988c0d30d1c94157c3c2fce841414daa2d0..d0d5ba9dba5e0a1a923e180a86c5d62fbad03a9b 100644 (file)
--- 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) {