aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/ich8lan.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2009-11-19 07:34:20 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-20 16:53:20 -0500
commit38eb394e33d65abb9d05411547d2058db53b4d23 (patch)
tree133af36f907a4e32c1f4870cbfef73c4aaf4675a /drivers/net/e1000e/ich8lan.c
parent30b768323f87bca15f14d6d146da397f98c29fe6 (diff)
e1000e: partial revert of 3ec2a2b8 plus FC workraround for 82577/8
Commit 3ec2a2b80f3eb53851fe4cef9e65b5d33376ef89 broke Tx/Rx when using jumbo frames on certain parts (i.e. only PAUSE frames could be exchanged once the high water mark was reached preventing normal packet traffic). This patch reverts the breakage and sets appropriate high and low water marks of the Rx FIFO for 82577/82578 which require a workaround due to a flow control issue in hardware. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/ich8lan.c')
-rw-r--r--drivers/net/e1000e/ich8lan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 51ddb04ab195..92cf10333654 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -3558,6 +3558,7 @@ struct e1000_info e1000_pch_info = {
3558 | FLAG_HAS_AMT 3558 | FLAG_HAS_AMT
3559 | FLAG_HAS_FLASH 3559 | FLAG_HAS_FLASH
3560 | FLAG_HAS_JUMBO_FRAMES 3560 | FLAG_HAS_JUMBO_FRAMES
3561 | FLAG_DISABLE_FC_PAUSE_TIME /* errata */
3561 | FLAG_APME_IN_WUC, 3562 | FLAG_APME_IN_WUC,
3562 .pba = 26, 3563 .pba = 26,
3563 .max_hw_frame_size = 4096, 3564 .max_hw_frame_size = 4096,