netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Don Skidmore <donald.c.skidmore@intel.com>,
	netdev@vger.kernel.org, gospo@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 08/10] ixgbe: fix ixgbe_fc_autoneg_fiber bug
Date: Mon, 29 Aug 2011 01:41:06 -0700	[thread overview]
Message-ID: <1314607268-26958-9-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1314607268-26958-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Don Skidmore <donald.c.skidmore@intel.com>

A logic error in ixgbe_fc_autoneg_fiber() that treated a masked u32 as a
boolean would make it so we would never fall hit a error check case.  So
now I force the u32 to a boolean value with '!!'.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index fc1375f..90a04e2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -2121,8 +2121,8 @@ static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)
 	 */
 
 	linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
-	if (((linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
-	    ((linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
+	if ((!!(linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
+	    (!!(linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
 		ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
 		goto out;
 	}
-- 
1.7.6

  parent reply	other threads:[~2011-08-29  8:41 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-29  8:40 [net-next 00/10][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2011-08-29  8:40 ` [net-next 01/10] ixgbe: Add support for setting CC bit when SR-IOV is enabled Jeff Kirsher
2011-08-29  8:41 ` [net-next 02/10] ixgbe: Always tag VLAN tagged packets Jeff Kirsher
2011-08-29  8:41 ` [net-next 03/10] ixgbe: fixup remaining call sites for arbitrary TCs Jeff Kirsher
2011-08-29  8:41 ` [net-next 04/10] ixgbe: remove unneeded fdir pb alloc case Jeff Kirsher
2011-08-29  8:41 ` [net-next 05/10] ixgbe: consolidate, setup for multiple traffic classes Jeff Kirsher
2011-08-29  8:41 ` [net-next 06/10] ixgbe: PFC not cleared on X540 devices Jeff Kirsher
2011-08-29  8:41 ` [net-next 07/10] ixgbe: cleanup feature flags in ixgbe_probe Jeff Kirsher
2011-08-29  8:41 ` Jeff Kirsher [this message]
2011-08-29  8:41 ` [net-next 09/10] ixgbe: add check for supported modes Jeff Kirsher
2011-08-29  8:41 ` [net-next 10/10] ixgbe: clear RNBC only for 82598 Jeff Kirsher
2011-08-29 16:26 ` [net-next 00/10][pull request] Intel Wired LAN Driver Update David Miller

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=1314607268-26958-9-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=donald.c.skidmore@intel.com \
    --cc=gospo@redhat.com \
    --cc=netdev@vger.kernel.org \
    /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).