ixgbe: Make sure boolean assignments from bitwise operations done correctly
authorPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Thu, 16 Jul 2009 15:50:32 +0000 (15:50 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jul 2009 16:47:35 +0000 (09:47 -0700)
When the link comes up, the driver detects which flow control settings are
active.  This is done using bitwise operations directly from the hardware
registers, and assumes the proper boolean assignment.  Make this an
explicit boolean value before assignment to the bool.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ixgbe/ixgbe_main.c

index e3442f47f932a6ceb7d3f70cf84f51907be8bb8e..09394c14ee5175c438643f76633f1c512ac58f1a 100644 (file)
@@ -4643,13 +4643,13 @@ static void ixgbe_watchdog_task(struct work_struct *work)
                        if (hw->mac.type == ixgbe_mac_82599EB) {
                                u32 mflcn = IXGBE_READ_REG(hw, IXGBE_MFLCN);
                                u32 fccfg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
-                               flow_rx = (mflcn & IXGBE_MFLCN_RFCE);
-                               flow_tx = (fccfg & IXGBE_FCCFG_TFCE_802_3X);
+                               flow_rx = !!(mflcn & IXGBE_MFLCN_RFCE);
+                               flow_tx = !!(fccfg & IXGBE_FCCFG_TFCE_802_3X);
                        } else {
                                u32 frctl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
                                u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS);
-                               flow_rx = (frctl & IXGBE_FCTRL_RFCE);
-                               flow_tx = (rmcs & IXGBE_RMCS_TFCE_802_3X);
+                               flow_rx = !!(frctl & IXGBE_FCTRL_RFCE);
+                               flow_tx = !!(rmcs & IXGBE_RMCS_TFCE_802_3X);
                        }
 
                        printk(KERN_INFO "ixgbe: %s NIC Link is Up %s, "