aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/ethtool.c
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2007-10-05 18:22:02 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:55:25 -0400
commit309af40b5f4c2065c9a5f74a360ad3d3b0c9c9cd (patch)
tree9e11fd2654cc49431097d5a66209b338fc26bf70 /drivers/net/e1000e/ethtool.c
parent4e6c709c5ab886be0ddbc96c4f96534e55920e68 (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/ethtool.c')
-rw-r--r--drivers/net/e1000e/ethtool.c1
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,
301 hw->mac.original_fc = hw->mac.fc; 301 hw->mac.original_fc = hw->mac.fc;
302 302
303 if (adapter->fc_autoneg == AUTONEG_ENABLE) { 303 if (adapter->fc_autoneg == AUTONEG_ENABLE) {
304 hw->mac.fc = e1000_fc_default;
304 if (netif_running(adapter->netdev)) { 305 if (netif_running(adapter->netdev)) {
305 e1000e_down(adapter); 306 e1000e_down(adapter);
306 e1000e_up(adapter); 307 e1000e_up(adapter);