Skip to content

Commit 3ff519e

Browse files
committed
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 <[email protected]> Signed-off-by: Sudarsana Kalluru <[email protected]>
2 parents 94f6a80 + 090477e commit 3ff519e

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

drivers/net/ethernet/qlogic/qed/qed_l2.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ int qed_l2_alloc(struct qed_hwfn *p_hwfn)
115115

116116
void qed_l2_setup(struct qed_hwfn *p_hwfn)
117117
{
118-
if (p_hwfn->hw_info.personality != QED_PCI_ETH &&
119-
p_hwfn->hw_info.personality != QED_PCI_ETH_ROCE)
118+
if (!QED_IS_L2_PERSONALITY(p_hwfn))
120119
return;
121120

122121
mutex_init(&p_hwfn->p_l2_info->lock);
@@ -126,8 +125,7 @@ void qed_l2_free(struct qed_hwfn *p_hwfn)
126125
{
127126
u32 i;
128127

129-
if (p_hwfn->hw_info.personality != QED_PCI_ETH &&
130-
p_hwfn->hw_info.personality != QED_PCI_ETH_ROCE)
128+
if (!QED_IS_L2_PERSONALITY(p_hwfn))
131129
return;
132130

133131
if (!p_hwfn->p_l2_info)

drivers/net/ethernet/qlogic/qede/qede_rdma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ qede_rdma_get_free_event_node(struct qede_dev *edev)
238238
}
239239

240240
if (!found) {
241-
event_node = kzalloc(sizeof(*event_node), GFP_KERNEL);
241+
event_node = kzalloc(sizeof(*event_node), GFP_ATOMIC);
242242
if (!event_node) {
243243
DP_NOTICE(edev,
244244
"qedr: Could not allocate memory for rdma work\n");

0 commit comments

Comments
 (0)