Commit 1a36d7fa authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher

i40e/i40evf: use logical operators, not bitwise

Mr. Spock would certainly raise an eyebrow to see us using bitwise
operators, when we should clearly be relying on logic. Fascinating.

Change-ID: Ie338010c016f93e9faa2002c07c90b15134b7477
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f16704e5
...@@ -1996,7 +1996,8 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) ...@@ -1996,7 +1996,8 @@ int i40e_napi_poll(struct napi_struct *napi, int budget)
* budget and be more aggressive about cleaning up the Tx descriptors. * budget and be more aggressive about cleaning up the Tx descriptors.
*/ */
i40e_for_each_ring(ring, q_vector->tx) { i40e_for_each_ring(ring, q_vector->tx) {
clean_complete &= i40e_clean_tx_irq(ring, vsi->work_limit); clean_complete = clean_complete &&
i40e_clean_tx_irq(ring, vsi->work_limit);
arm_wb = arm_wb || ring->arm_wb; arm_wb = arm_wb || ring->arm_wb;
ring->arm_wb = false; ring->arm_wb = false;
} }
...@@ -2020,7 +2021,7 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) ...@@ -2020,7 +2021,7 @@ int i40e_napi_poll(struct napi_struct *napi, int budget)
work_done += cleaned; work_done += cleaned;
/* if we didn't clean as many as budgeted, we must be done */ /* if we didn't clean as many as budgeted, we must be done */
clean_complete &= (budget_per_ring != cleaned); clean_complete = clean_complete && (budget_per_ring > cleaned);
} }
/* If work not completed, return budget and polling will return */ /* If work not completed, return budget and polling will return */
......
...@@ -1432,7 +1432,8 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) ...@@ -1432,7 +1432,8 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget)
* budget and be more aggressive about cleaning up the Tx descriptors. * budget and be more aggressive about cleaning up the Tx descriptors.
*/ */
i40e_for_each_ring(ring, q_vector->tx) { i40e_for_each_ring(ring, q_vector->tx) {
clean_complete &= i40e_clean_tx_irq(ring, vsi->work_limit); clean_complete = clean_complete &&
i40e_clean_tx_irq(ring, vsi->work_limit);
arm_wb = arm_wb || ring->arm_wb; arm_wb = arm_wb || ring->arm_wb;
ring->arm_wb = false; ring->arm_wb = false;
} }
...@@ -1456,7 +1457,7 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) ...@@ -1456,7 +1457,7 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget)
work_done += cleaned; work_done += cleaned;
/* if we didn't clean as many as budgeted, we must be done */ /* if we didn't clean as many as budgeted, we must be done */
clean_complete &= (budget_per_ring != cleaned); clean_complete = clean_complete && (budget_per_ring > cleaned);
} }
/* If work not completed, return budget and polling will return */ /* If work not completed, return budget and polling will return */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment