diff options
| author |   Auke Kok <auke-jan.h.kok@intel.com> | 2007-10-05 15:22:02 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:55:25 -0700 |
| commit | 309af40b5f4c2065c9a5f74a360ad3d3b0c9c9cd (patch) | |
| tree | 9e11fd2654cc49431097d5a66209b338fc26bf70 /drivers/net/e1000e/ethtool.c | |
| parent | e1000e: Simple optimizations in e1000_xmit_frame (diff) | |
| download | linux-dev-309af40b5f4c2065c9a5f74a360ad3d3b0c9c9cd.tar.xz linux-dev-309af40b5f4c2065c9a5f74a360ad3d3b0c9c9cd.zip | |
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/ethtool.c')
| -rw-r--r-- | drivers/net/e1000e/ethtool.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 2e8218fb0579..b7a7e2ae5e13 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c @@ -301,6 +301,7 @@ static int e1000_set_pauseparam(struct net_device *netdev, hw->mac.original_fc = hw->mac.fc; if (adapter->fc_autoneg == AUTONEG_ENABLE) { + hw->mac.fc = e1000_fc_default; if (netif_running(adapter->netdev)) { e1000e_down(adapter); e1000e_up(adapter); |