aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Skidmore <donald.c.skidmore@intel.com>2011-07-27 21:00:58 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-29 04:31:46 -0400
commit53f096de3a2d04dc034b9dbcb160c6448960309d (patch)
tree52a1cfb3679315c6610536f0dd921e9d80e1b2f8
parent6a864abbcea970de2ac3afaf530c44548e9d42a0 (diff)
ixgbe: fix ixgbe_fc_autoneg_fiber bug
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>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_common.c4
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 fc1375f26fe5..90a04e2471df 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)
2121 */ 2121 */
2122 2122
2123 linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA); 2123 linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
2124 if (((linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) || 2124 if ((!!(linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
2125 ((linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) { 2125 (!!(linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
2126 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED; 2126 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
2127 goto out; 2127 goto out;
2128 } 2128 }