diff options
author | Auke Kok <auke-jan.h.kok@intel.com> | 2007-10-05 18:22:02 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:25 -0400 |
commit | 309af40b5f4c2065c9a5f74a360ad3d3b0c9c9cd (patch) | |
tree | 9e11fd2654cc49431097d5a66209b338fc26bf70 /drivers/net/e1000e/netdev.c | |
parent | 4e6c709c5ab886be0ddbc96c4f96534e55920e68 (diff) |
e1000e: restore flow control settings properly
After a cable unplug the forced flow control settings were lost
accidentally and the flow control settings fell back to the default
EEPROM determined values. This breaks for people who want to
run without fc enabled - after a cable reset the driver would
refuse to run with fc disabled.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 600538bc932f..033e124d1c1f 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -4195,6 +4195,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
4195 | 4195 | ||
4196 | /* Initialize link parameters. User can change them with ethtool */ | 4196 | /* Initialize link parameters. User can change them with ethtool */ |
4197 | adapter->hw.mac.autoneg = 1; | 4197 | adapter->hw.mac.autoneg = 1; |
4198 | adapter->fc_autoneg = 1; | ||
4198 | adapter->hw.mac.original_fc = e1000_fc_default; | 4199 | adapter->hw.mac.original_fc = e1000_fc_default; |
4199 | adapter->hw.mac.fc = e1000_fc_default; | 4200 | adapter->hw.mac.fc = e1000_fc_default; |
4200 | adapter->hw.phy.autoneg_advertised = 0x2f; | 4201 | adapter->hw.phy.autoneg_advertised = 0x2f; |