summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/e1000e/mac.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-02-22 13:03:03 +0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-02-25 09:41:44 +0400
commitb20caa80e8c9b0180defb42678209dc0d6c229d2 (patch)
tree126e7ef4d92a1dbd4eddc7ccb7a2fa0b44b45e0f /drivers/net/ethernet/intel/e1000e/mac.c
parentb2a50e1a1d16d8e377a0c540de36803197bde3fb (diff)
downloadlinux-b20caa80e8c9b0180defb42678209dc0d6c229d2.tar.xz
e1000e: use true/false for boolean send_xon, do not assume always true
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/mac.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/mac.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 4130134b0d32..d55f5887b07a 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -969,7 +969,9 @@ s32 e1000e_set_fc_watermarks(struct e1000_hw *hw)
* XON frames.
*/
fcrtl = hw->fc.low_water;
- fcrtl |= E1000_FCRTL_XONE;
+ if (hw->fc.send_xon)
+ fcrtl |= E1000_FCRTL_XONE;
+
fcrth = hw->fc.high_water;
}
ew32(FCRTL, fcrtl);