| From e3f56991e9c1db7d6add04a1d71d9672ff3c214d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 10 Feb 2020 10:59:18 -0800 |
| Subject: i40e: Fix the conditional for i40e_vc_validate_vqs_bitmaps |
| |
| From: Brett Creeley <brett.creeley@intel.com> |
| |
| [ Upstream commit f27f37a04a69890ac85d9155f03ee2d23b678d8f ] |
| |
| Commit d9d6a9aed3f6 ("i40e: Fix virtchnl_queue_select bitmap |
| validation") introduced a necessary change for verifying how queue |
| bitmaps from the iavf driver get validated. Unfortunately, the |
| conditional was reversed. Fix this. |
| |
| Fixes: d9d6a9aed3f6 ("i40e: Fix virtchnl_queue_select bitmap validation") |
| Signed-off-by: Brett Creeley <brett.creeley@intel.com> |
| Tested-by: Andrew Bowers <andrewx.bowers@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |
| index 69523ac85639e..56b9e445732ba 100644 |
| --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |
| +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |
| @@ -2362,7 +2362,7 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg) |
| goto error_param; |
| } |
| |
| - if (i40e_vc_validate_vqs_bitmaps(vqs)) { |
| + if (!i40e_vc_validate_vqs_bitmaps(vqs)) { |
| aq_ret = I40E_ERR_PARAM; |
| goto error_param; |
| } |
| @@ -2424,7 +2424,7 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg) |
| goto error_param; |
| } |
| |
| - if (i40e_vc_validate_vqs_bitmaps(vqs)) { |
| + if (!i40e_vc_validate_vqs_bitmaps(vqs)) { |
| aq_ret = I40E_ERR_PARAM; |
| goto error_param; |
| } |
| -- |
| 2.20.1 |
| |