summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/ich8lan.c
diff options
context:
space:
mode:
authorBruce Allan2010-05-10 17:02:12 +0200
committerDavid S. Miller2010-05-13 08:31:13 +0200
commita305595b127fdbe7ab5ba458f7ee470a82a3b82c (patch)
tree3f771c91aaa998e296391a694fb29a5a2841651c /drivers/net/e1000e/ich8lan.c
parente1000e: fix checks for manageability enabled and management pass-through (diff)
downloadkernel-qcow2-linux-a305595b127fdbe7ab5ba458f7ee470a82a3b82c.tar.gz
kernel-qcow2-linux-a305595b127fdbe7ab5ba458f7ee470a82a3b82c.tar.xz
kernel-qcow2-linux-a305595b127fdbe7ab5ba458f7ee470a82a3b82c.zip
e1000e: move settting of flow control refresh timer to link setup code
The flow control refresh timer value needs to be saved off so that it can be programmed into the approrpiate register when applicable but without a reset, e.g. when changing flow control parameters via ethtool. 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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 8efe9a7cbaad..2b2cffc017be 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -2823,6 +2823,8 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
ew32(FCTTV, hw->fc.pause_time);
if ((hw->phy.type == e1000_phy_82578) ||
(hw->phy.type == e1000_phy_82577)) {
+ ew32(FCRTV_PCH, hw->fc.refresh_time);
+
ret_val = hw->phy.ops.write_reg(hw,
PHY_REG(BM_PORT_CTRL_PAGE, 27),
hw->fc.pause_time);