e1000e: fix flow control when using ethtool overrides
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Thu, 21 Feb 2008 23:10:57 +0000 (15:10 -0800)
committerJeff Garzik <jeff@garzik.org>
Sun, 24 Feb 2008 05:07:47 +0000 (00:07 -0500)
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/e1000e/lib.c

index 16f35fadb74b8a9ca4ce005b0617791832890832..0860b5fb34717f7ecfc3ed360d36210e83e395a4 100644 (file)
@@ -589,9 +589,6 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
        s32 ret_val;
        u16 nvm_data;
 
-       if (mac->fc != e1000_fc_default)
-               return 0;
-
        /* Read and store word 0x0F of the EEPROM. This word contains bits
         * that determine the hardware's default PAUSE (flow control) mode,
         * a bit that determines whether the HW defaults to enabling or