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

Commit 7f8f5641 authored by Tom Rix's avatar Tom Rix Committed by Greg Kroah-Hartman
Browse files

qed: return status of qed_iov_get_link 



[ Upstream commit d9dc0c84ad2d4cc911ba252c973d1bf18d5eb9cf ]

Clang static analysis reports this issue
qed_sriov.c:4727:19: warning: Assigned value is
  garbage or undefined
  ivi->max_tx_rate = tx_rate ? tx_rate : link.speed;
                   ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

link is only sometimes set by the call to qed_iov_get_link()
qed_iov_get_link fails without setting link or returning
status.  So change the decl to return status.

Fixes: 73390ac9 ("qed*: support ndo_get_vf_config")
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f59e7860

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

+11 −7
Original line number Diff line number Diff line
@@ -3801,7 +3801,7 @@ bool qed_iov_mark_vf_flr(struct qed_hwfn *p_hwfn, u32 *p_disabled_vfs) 
	return found;

}



static void qed_iov_get_link(struct qed_hwfn *p_hwfn,

static int qed_iov_get_link(struct qed_hwfn *p_hwfn,

			    u16 vfid,

			    struct qed_mcp_link_params *p_params,

			    struct qed_mcp_link_state *p_link,
@@ -3813,7 +3813,7 @@ static void qed_iov_get_link(struct qed_hwfn *p_hwfn, 
	struct qed_bulletin_content *p_bulletin;



	if (!p_vf)

		return;

		return -EINVAL;



	p_bulletin = p_vf->bulletin.p_virt;
@@ -3823,6 +3823,7 @@ static void qed_iov_get_link(struct qed_hwfn *p_hwfn, 
		__qed_vf_get_link_state(p_hwfn, p_link, p_bulletin);

	if (p_caps)

		__qed_vf_get_link_caps(p_hwfn, p_caps, p_bulletin);

	return 0;

}



static int
@@ -4684,6 +4685,7 @@ static int qed_get_vf_config(struct qed_dev *cdev, 
	struct qed_public_vf_info *vf_info;

	struct qed_mcp_link_state link;

	u32 tx_rate;

	int ret;



	/* Sanitize request */

	if (IS_VF(cdev))
@@ -4697,7 +4699,9 @@ static int qed_get_vf_config(struct qed_dev *cdev, 


	vf_info = qed_iov_get_public_vf_info(hwfn, vf_id, true);



	qed_iov_get_link(hwfn, vf_id, NULL, &link, NULL);

	ret = qed_iov_get_link(hwfn, vf_id, NULL, &link, NULL);

	if (ret)

		return ret;



	/* Fill information about VF */

	ivi->vf = vf_id;