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: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 1abef01e5a2c6d12f48301d1988dfbcbfd648d1b..0ffa9a89986c53038715420758bbd295ed7cbced 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -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 */

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 6f739a7bc2717558d733447ae9fc442a91a355ce..76bad75b0f673859ae85b2ea077b9e527cd67deb 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -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 */