Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 158981
b: refs/heads/master
c: 078788b
h: refs/heads/master
i:
  158979: d5111dd
v: v3
  • Loading branch information
Peter P Waskiewicz Jr authored and David S. Miller committed Jul 17, 2009
1 parent fd4fb5a commit 59bef0c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f4ec443b2b27ecb401eee35a7bea330438556c7e
refs/heads/master: 078788b6a68828c1caf395b48110535e051cd623
8 changes: 4 additions & 4 deletions trunk/drivers/net/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
Expand Down

0 comments on commit 59bef0c

Please sign in to comment.