i40e: clear __I40E_VIRTCHNL_OP_PENDING on invalid min Tx rate

sassmann · Jeff Kirsher · commit 8ad2e2982947 · 2019-09-11T09:10:46.000-07:00
In the case of an invalid min Tx rate being requested
i40e_ndo_set_vf_bw() immediately returns -EINVAL instead of releasing
__I40E_VIRTCHNL_OP_PENDING first.

Signed-off-by: Stefan Assmann &lt;sassmann@kpanic.de&gt;
Tested-by: Andrew Bowers &lt;andrewx.bowers@intel.com&gt;
Signed-off-by: Jeff Kirsher &lt;jeffrey.t.kirsher@intel.com&gt;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -4263,7 +4263,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
 	if (min_tx_rate) {
 		dev_err(&pf->pdev->dev, "Invalid min tx rate (%d) (greater than 0) specified for VF %d.\n",
 			min_tx_rate, vf_id);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto error;
 	}
 
 	vf = &pf->vf[vf_id];

Original file line number	Diff line number	Diff line change
`@@ -4263,7 +4263,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,`
`4263`	`4263`	`if (min_tx_rate) {`
`4264`	`4264`	`dev_err(&pf->pdev->dev, "Invalid min tx rate (%d) (greater than 0) specified for VF %d.\n",`
`4265`	`4265`	`min_tx_rate, vf_id);`
`4266`		`- return -EINVAL;`
	`4266`	`+ ret = -EINVAL;`
	`4267`	`+ goto error;`
`4267`	`4268`	`}`
`4268`	`4269`
`4269`	`4270`	`vf = &pf->vf[vf_id];`