Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ff519e6 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarMichal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: default avatarSudarsana Kalluru <Sudarsana.Kalluru@cavium.com>
parents 94f6a80c 090477e4

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

+2 −4
Original line number Diff line number Diff line
@@ -115,8 +115,7 @@ int qed_l2_alloc(struct qed_hwfn *p_hwfn) 


void qed_l2_setup(struct qed_hwfn *p_hwfn)

{

	if (p_hwfn->hw_info.personality != QED_PCI_ETH &&

	    p_hwfn->hw_info.personality != QED_PCI_ETH_ROCE)

	if (!QED_IS_L2_PERSONALITY(p_hwfn))

		return;



	mutex_init(&p_hwfn->p_l2_info->lock);
@@ -126,8 +125,7 @@ void qed_l2_free(struct qed_hwfn *p_hwfn) 
{

	u32 i;



	if (p_hwfn->hw_info.personality != QED_PCI_ETH &&

	    p_hwfn->hw_info.personality != QED_PCI_ETH_ROCE)

	if (!QED_IS_L2_PERSONALITY(p_hwfn))

		return;



	if (!p_hwfn->p_l2_info)

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

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ qede_rdma_get_free_event_node(struct qede_dev *edev) 
	}



	if (!found) {

		event_node = kzalloc(sizeof(*event_node), GFP_KERNEL);

		event_node = kzalloc(sizeof(*event_node), GFP_ATOMIC);

		if (!event_node) {

			DP_NOTICE(edev,

				  "qedr: Could not allocate memory for rdma work\n");