qed: Fix use of incorrect shmem address.

Incorrect shared memory address is used while deriving the values
for tc and pri_type. Use shmem address corresponding to 'oem_cfg_func'
where the management firmare saves tc/pri_type values.

Fixes: cac6f691 ("qed: Add support for Unified Fabric Port")
Signed-off-by: Sudarsana Reddy Kalluru <[email protected]>
Signed-off-by: Ariel Elior <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 2612e3e458d9a744b7396099ebf93fc738dea01b..6f9927d1a50197f2484aab1e03450febef52bd6a 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -1514,9 +1514,10 @@ void qed_mcp_read_ufp_config(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
        }
 
        qed_mcp_get_shmem_func(p_hwfn, p_ptt, &shmem_info, MCP_PF_ID(p_hwfn));
-       val = (port_cfg & OEM_CFG_FUNC_TC_MASK) >> OEM_CFG_FUNC_TC_OFFSET;
+       val = (shmem_info.oem_cfg_func & OEM_CFG_FUNC_TC_MASK) >>
+               OEM_CFG_FUNC_TC_OFFSET;
        p_hwfn->ufp_info.tc = (u8)val;
-       val = (port_cfg & OEM_CFG_FUNC_HOST_PRI_CTRL_MASK) >>
+       val = (shmem_info.oem_cfg_func & OEM_CFG_FUNC_HOST_PRI_CTRL_MASK) >>
                OEM_CFG_FUNC_HOST_PRI_CTRL_OFFSET;
        if (val == OEM_CFG_FUNC_HOST_PRI_CTRL_VNIC) {
                p_hwfn->ufp_info.pri_type = QED_UFP_PRI_VNIC;