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

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

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

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+3 −2
Original line number Diff line number Diff line
@@ -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.

	 */

	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;

		ring->arm_wb = false;

	}
@@ -2020,7 +2021,7 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) 


		work_done += cleaned;

		/* 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 */

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+3 −2
Original line number Diff line number Diff line
@@ -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.

	 */

	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;

		ring->arm_wb = false;

	}
@@ -1456,7 +1457,7 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) 


		work_done += cleaned;

		/* 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 */