diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2009-11-19 12:34:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-20 13:53:20 -0800 |
| commit | 38eb394e33d65abb9d05411547d2058db53b4d23 (patch) | |
| tree | 133af36f907a4e32c1f4870cbfef73c4aaf4675a /drivers/net/e1000e/ich8lan.c | |
| parent | 30b768323f87bca15f14d6d146da397f98c29fe6 (diff) | |
| download | kernel_samsung_smdk4412-38eb394e33d65abb9d05411547d2058db53b4d23.zip kernel_samsung_smdk4412-38eb394e33d65abb9d05411547d2058db53b4d23.tar.gz kernel_samsung_smdk4412-38eb394e33d65abb9d05411547d2058db53b4d23.tar.bz2 | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 51ddb04..92cf103 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c @@ -3558,6 +3558,7 @@ struct e1000_info e1000_pch_info = { | FLAG_HAS_AMT | FLAG_HAS_FLASH | FLAG_HAS_JUMBO_FRAMES + | FLAG_DISABLE_FC_PAUSE_TIME /* errata */ | FLAG_APME_IN_WUC, .pba = 26, .max_hw_frame_size = 4096, |