[PATCH net-next 11/12] qed: Conserve RDMA resources when !QEDR

[Yuval Mintz]

From: Ram Amrani <ram.amr...@cavium.com>

If qedr isn't part of the kernel then don't allocate RDMA resources
for it in qed.

Signed-off-by: Ram Amrani <ram.amr...@cavium.com>
Signed-off-by: Yuval Mintz <yuval.mi...@cavium.com>
---
 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c 
b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 2566741..5d026db 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -1122,7 +1122,9 @@ int qed_mcp_get_media_type(struct qed_dev *cdev, u32 
*p_media_type)
 
        switch (p_info->config & FUNC_MF_CFG_PROTOCOL_MASK) {
        case FUNC_MF_CFG_PROTOCOL_ETHERNET:
-               if (qed_mcp_get_shmem_proto_mfw(p_hwfn, p_ptt, p_proto))
+               if (!IS_ENABLED(CONFIG_QED_RDMA))
+                       *p_proto = QED_PCI_ETH;
+               else if (qed_mcp_get_shmem_proto_mfw(p_hwfn, p_ptt, p_proto))
                        qed_mcp_get_shmem_proto_legacy(p_hwfn, p_proto);
                break;
        case FUNC_MF_CFG_PROTOCOL_ISCSI:
-- 
1.9.3