---

yaml --- r: 150607 b: refs/heads/master c: 37289d9 h: refs/heads/master i: 150605: 588cb20 150603: deb4569 150599: d665edd 150591: 5b34939 v: v3
git-mirror · Jun 3, 2009 · 8252018 · 8252018
1 parent 8aaf171
commit 8252018
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4f58f5455ba0efda36fb33c37074922d1527a10
+refs/heads/master: 37289d9c1e72a186ea5f28bee79efeb1d4e7309c
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
@@ -2348,8 +2348,13 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
 	 * the default flow control setting, so we explicitly
 	 * set it to full.
 	 */
-	if (hw->fc.requested_mode == e1000_fc_default)
-		hw->fc.requested_mode = e1000_fc_full;
+	if (hw->fc.requested_mode == e1000_fc_default) {
+		/* Workaround h/w hang when Tx flow control enabled */
+		if (hw->mac.type == e1000_pchlan)
+			hw->fc.requested_mode = e1000_fc_rx_pause;
+		else
+			hw->fc.requested_mode = e1000_fc_full;
+	}
 
 	/*
 	 * Save off the requested flow control mode for use later.  Depending