From: Ram Amrani Date: Sun, 1 Jan 2017 11:57:10 +0000 (+0200) Subject: qed: Conserve RDMA resources when !QEDR X-Git-Tag: v4.1.12-93~2^2~183 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1de7355e8561ebae709a118a7401ad7beb9539d8;p=users%2Fjedix%2Flinux-maple.git qed: Conserve RDMA resources when !QEDR Orabug: 25477939 If qedr isn't part of the kernel then don't allocate RDMA resources for it in qed. Signed-off-by: Ram Amrani Signed-off-by: Yuval Mintz Signed-off-by: David S. Miller (cherry picked from commit 1fe582ecade714e90e71c67c32edb7b5b809d651) Signed-off-by: Brian Maly --- diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c index cf7b66f6be117..989e20a2a7dee 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c @@ -1119,7 +1119,9 @@ qed_mcp_get_shmem_proto(struct qed_hwfn *p_hwfn, 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: