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

Commit 44cdb791 authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e/i40evf: use logical operator 



We shouldn't be using a bitwise operator here; it's not a bitwise
operation. Use a logical operator instead. Why doesn't c have a
logical-or-and-assign operator?

Change-ID: Id84f3ca884910bed7073c84b1e16a102e958d0de
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 b82bc49e

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

+1 −1
Original line number Diff line number Diff line
@@ -1907,7 +1907,7 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) 
	 */

	i40e_for_each_ring(ring, q_vector->tx) {

		clean_complete &= i40e_clean_tx_irq(ring, vsi->work_limit);

		arm_wb |= ring->arm_wb;

		arm_wb = arm_wb || ring->arm_wb;

		ring->arm_wb = false;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -1331,7 +1331,7 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) 
	 */

	i40e_for_each_ring(ring, q_vector->tx) {

		clean_complete &= i40e_clean_tx_irq(ring, vsi->work_limit);

		arm_wb |= ring->arm_wb;

		arm_wb = arm_wb || ring->arm_wb;

		ring->arm_wb = false;

	}