projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8806787
)
qed: Conserve RDMA resources when !QEDR
author
Ram Amrani
<
[email protected]
>
Sun, 1 Jan 2017 11:57:10 +0000
(13:57 +0200)
committer
David S. Miller
<
[email protected]
>
Mon, 2 Jan 2017 02:02:14 +0000
(21:02 -0500)
If qedr isn't part of the kernel then don't allocate RDMA resources
for it in qed.
Signed-off-by: Ram Amrani <
[email protected]
>
Signed-off-by: Yuval Mintz <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/qlogic/qed/qed_mcp.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 256674131c477f2621699695936af875a4967ddc..c8a87759403225400176f36ba32261f6712777e3 100644
(file)
--- a/
drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/
drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@
-1122,7
+1122,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: