From 8252018c21b2e8efd4eda881a3a54d7e2ce20783 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Tue, 2 Jun 2009 11:29:37 +0000 Subject: [PATCH] --- yaml --- r: 150607 b: refs/heads/master c: 37289d9c1e72a186ea5f28bee79efeb1d4e7309c h: refs/heads/master i: 150605: 588cb202b169464a134b859795bd0c53184b5109 150603: deb456971253ebd0ac74ab7dca539dffda75384b 150599: d665edd4fcccc808cc02babbdfcc31ed47ae3a48 150591: 5b34939b2a88e17fe150587fb708f59cfacae8a5 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/ich8lan.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f0d320a4c7db..9caa7abdce3d 100644 --- 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 index b69c8190da30..9e23f50fb9cd 100644 --- 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