OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ixgbe: Make sure boolean assignments from bitwise operations done correctly 

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>
This commit is contained in:
Peter P Waskiewicz Jr 2009-07-16 15:50:32 +00:00 committed by David S. Miller
parent f4ec443b2b
commit 078788b6a6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ixgbe/ixgbe_main.c
View File

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