From 40ca7b783c5c9e95c4edfadfc98f86911dc3a5cb Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 22 Feb 2012 09:03:03 +0000
Subject: [PATCH] --- yaml --- r: 290478 b: refs/heads/master c:
 b20caa80e8c9b0180defb42678209dc0d6c229d2 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/mac.c    | 4 +++-
 trunk/drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5a7a2739d83a..856db1cf04d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2a50e1a1d16d8e377a0c540de36803197bde3fb
+refs/heads/master: b20caa80e8c9b0180defb42678209dc0d6c229d2
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/mac.c b/trunk/drivers/net/ethernet/intel/e1000e/mac.c
index 4130134b0d32..d55f5887b07a 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/trunk/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);
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c
index 56c1aec65186..8b62870e2c25 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3464,7 +3464,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
 		fc->pause_time = 0xFFFF;
 	else
 		fc->pause_time = E1000_FC_PAUSE_TIME;
-	fc->send_xon = 1;
+	fc->send_xon = true;
 	fc->current_mode = fc->requested_mode;
 
 	switch (hw->mac.type) {