diff options
| author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2008-02-22 00:10:57 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-02-24 06:07:47 +0100 |
| commit | 4a5694e66428607585c9f4dd14bcf4158d2de191 (patch) | |
| tree | d3a77784ef3f7c7d6e494dedb10aa0c2f3f044f3 /drivers/net/e1000e/lib.c | |
| parent | e1000e: fix link up message to show ethX: (diff) | |
| download | linux-4a5694e66428607585c9f4dd14bcf4158d2de191.tar.xz linux-4a5694e66428607585c9f4dd14bcf4158d2de191.zip | |
e1000e: fix flow control when using ethtool overrides
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>
Diffstat (limited to 'drivers/net/e1000e/lib.c')
| -rw-r--r-- | drivers/net/e1000e/lib.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 16f35fadb74b..0860b5fb3471 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c @@ -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 |