| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Michal Kalderon <Michal.Kalderon@cavium.com> |
| Date: Tue, 8 May 2018 21:29:18 +0300 |
| Subject: qed: Fix l2 initializations over iWARP personality |
| |
| From: Michal Kalderon <Michal.Kalderon@cavium.com> |
| |
| [ Upstream commit af6858ee423a309d93054c361c61099b8eb12bbf ] |
| |
| If qede driver was loaded on a device configured for iWARP |
| the l2 mutex wouldn't be allocated, and some l2 related |
| resources wouldn't be freed. |
| |
| fixes: c851a9dc4359 ("qed: Introduce iWARP personality") |
| Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com> |
| Signed-off-by: Sudarsana Kalluru <Sudarsana.Kalluru@cavium.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/net/ethernet/qlogic/qed/qed_l2.c |
| +++ b/drivers/net/ethernet/qlogic/qed/qed_l2.c |
| @@ -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) |
