diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2010-05-10 15:02:12 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 23:31:13 -0700 |
| commit | a305595b127fdbe7ab5ba458f7ee470a82a3b82c (patch) | |
| tree | 3f771c91aaa998e296391a694fb29a5a2841651c /drivers/net/e1000e/netdev.c | |
| parent | a65a4a0d51eaf9e5715dc24f8820c8689c3719a5 (diff) | |
| download | op-kernel-dev-a305595b127fdbe7ab5ba458f7ee470a82a3b82c.zip op-kernel-dev-a305595b127fdbe7ab5ba458f7ee470a82a3b82c.tar.gz | |
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/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 16a03c5..d1f60c5 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -3134,6 +3134,7 @@ void e1000e_reset(struct e1000_adapter *adapter) fc->high_water = 0x5000; fc->low_water = 0x3000; } + fc->refresh_time = 0x1000; } else { if ((adapter->flags & FLAG_HAS_ERT) && (adapter->netdev->mtu > ETH_DATA_LEN)) @@ -3171,10 +3172,6 @@ void e1000e_reset(struct e1000_adapter *adapter) if (mac->ops.init_hw(hw)) e_err("Hardware Error\n"); - /* additional part of the flow-control workaround above */ - if (hw->mac.type == e1000_pchlan) - ew32(FCRTV_PCH, 0x1000); - e1000_update_mng_vlan(adapter); /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */ |
