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

Commit d3a90b70 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e: don't use OR to check a value 



A couple of FD checks ended up using bitwise OR to check
a value, which ends up always being evaluated to true.

This should fix the issue.  Thanks to DaveJ for noticing
and reporting the issue!

CC: Dave Jones <davej@redhat.com>
Reported-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ebbe495f

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

+2 −2
Original line number Diff line number Diff line
@@ -458,13 +458,13 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring, 
		 */

		if (fcnt_prog >= (fcnt_avail - I40E_FDIR_BUFFER_FULL_MARGIN)) {

			/* Turn off ATR first */

			if (pf->flags | I40E_FLAG_FD_ATR_ENABLED) {

			if (pf->flags & I40E_FLAG_FD_ATR_ENABLED) {

				pf->flags &= ~I40E_FLAG_FD_ATR_ENABLED;

				dev_warn(&pdev->dev, "FD filter space full, ATR for further flows will be turned off\n");

				pf->auto_disable_flags |=

						       I40E_FLAG_FD_ATR_ENABLED;

				pf->flags |= I40E_FLAG_FDIR_REQUIRES_REINIT;

			} else if (pf->flags | I40E_FLAG_FD_SB_ENABLED) {

			} else if (pf->flags & I40E_FLAG_FD_SB_ENABLED) {

				pf->flags &= ~I40E_FLAG_FD_SB_ENABLED;

				dev_warn(&pdev->dev, "FD filter space full, new ntuple rules will not be added\n");

				pf->auto_disable_flags |=