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>

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 3bbfe605e111..0bdeca30c75f 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -639,9 +639,15 @@ s32 e1000e_setup_link(struct e1000_hw *hw)
         if (e1000_check_reset_block(hw))
                 return 0;
 
-        ret_val = e1000_set_default_fc_generic(hw);
-        if (ret_val)
-                return ret_val;
+        /*
+         * If flow control is set to default, set flow control based on
+         * the EEPROM flow control settings.
+         */
+        if (mac->fc == e1000_fc_default) {
+                ret_val = e1000_set_default_fc_generic(hw);
+                if (ret_val)
+                        return ret_val;
+        }
 
         /* We want to save off the original Flow Control configuration just
          * in case we get disconnected and then reconnected into a different