hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qed-rdma-fixes' 

Michal Kalderon says:

====================
qed*: Rdma fixes

This patch series include two fixes for bugs related to rdma.
The first has to do with loading the driver over an iWARP
device.
The second fixes a previous commit that added proper link
indication for iWARP / RoCE.
====================

Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: Sudarsana Kalluru <Sudarsana.Kalluru@cavium.com>
This commit is contained in:
David S. Miller 2018-05-10 15:22:36 -04:00
parent 94f6a80c0c 090477e4ac
commit 3ff519e6c9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/qlogic/qed/qed_l2.c
View File

@ -115,8 +115,7 @@ int qed_l2_alloc(struct qed_hwfn *p_hwfn)
void qed_l2_setup(struct qed_hwfn *p_hwfn) void qed_l2_setup(struct qed_hwfn *p_hwfn)
{ {
if (p_hwfn->hw_info.personality != QED_PCI_ETH && if (!QED_IS_L2_PERSONALITY(p_hwfn))
p_hwfn->hw_info.personality != QED_PCI_ETH_ROCE)
return; return;
mutex_init(&p_hwfn->p_l2_info->lock); mutex_init(&p_hwfn->p_l2_info->lock);
@ -126,8 +125,7 @@ void qed_l2_free(struct qed_hwfn *p_hwfn)
{ {
u32 i; u32 i;
if (p_hwfn->hw_info.personality != QED_PCI_ETH && if (!QED_IS_L2_PERSONALITY(p_hwfn))
p_hwfn->hw_info.personality != QED_PCI_ETH_ROCE)
return; return;
if (!p_hwfn->p_l2_info) if (!p_hwfn->p_l2_info)

2
drivers/net/ethernet/qlogic/qede/qede_rdma.c
View File

@ -238,7 +238,7 @@ qede_rdma_get_free_event_node(struct qede_dev *edev)
} }
if (!found) { if (!found) {
event_node = kzalloc(sizeof(*event_node), GFP_KERNEL); event_node = kzalloc(sizeof(*event_node), GFP_ATOMIC);
if (!event_node) { if (!event_node) {
DP_NOTICE(edev, DP_NOTICE(edev,
"qedr: Could not allocate memory for rdma work\n"); "qedr: Could not allocate memory for rdma work\n");