From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Dave Jones <davej@redhat.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 01/14] i40e: don't use OR to check a value
Date: Thu, 5 Jun 2014 00:49:14 -0700 [thread overview]
Message-ID: <1401954567-13557-2-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1401954567-13557-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
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: Dave Jones <davej@redhat.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 5a22187..1fe28ca 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -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 |=
--
1.9.3
next prev parent reply other threads:[~2014-06-05 7:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-05 7:49 [net-next 00/14][pull request] Intel Wired LAN Driver Updates 2014-06-05 Jeff Kirsher
2014-06-05 7:49 ` Jeff Kirsher [this message]
2014-06-05 7:49 ` [net-next 02/14] i40e: Allow disabling of DCB via debugfs Jeff Kirsher
2014-06-05 7:56 ` David Miller
2014-06-05 8:05 ` Jeff Kirsher
2014-06-05 7:49 ` [net-next 03/14] i40e: Rework register diagnostic Jeff Kirsher
2014-06-05 7:49 ` [net-next 04/14] i40e: remove check for large buffer Jeff Kirsher
2014-06-05 7:49 ` [net-next 05/14] i40e/i40evf: remove unused RX_LRO define Jeff Kirsher
2014-06-05 7:49 ` [net-next 06/14] i40e: clamp jumbo frame size Jeff Kirsher
2014-06-05 8:17 ` David Laight
2014-06-05 7:49 ` [net-next 07/14] i40evf: set descriptor multiple to 32 Jeff Kirsher
2014-06-05 7:49 ` [net-next 08/14] i40evf: fix crash when changing ring sizes Jeff Kirsher
2014-06-05 7:49 ` [net-next 09/14] i40e: notify VF of all types of resets Jeff Kirsher
2014-06-05 7:49 ` [net-next 10/14] i40e/i40evf: VEB structure added, GTIME macro update Jeff Kirsher
2014-06-05 7:49 ` [net-next 11/14] i40e: refactor send version Jeff Kirsher
2014-06-05 7:49 ` [net-next 12/14] i40e: refactor stats collection Jeff Kirsher
2014-06-05 7:49 ` [net-next 13/14] i40e/i40evf: remove rx_errors and rx_missed Jeff Kirsher
2014-06-05 7:49 ` [net-next 14/14] i40e: add missing VSI statistics Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401954567-13557-2-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davej@redhat.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=jesse.brandeburg@intel.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).