diff options
| author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2008-02-21 18:10:57 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-02-24 00:07:47 -0500 |
| commit | 4a5694e66428607585c9f4dd14bcf4158d2de191 (patch) | |
| tree | d3a77784ef3f7c7d6e494dedb10aa0c2f3f044f3 /drivers/net | |
| parent | 03ae221fe9987e22679642b5b687aebbb67bbb47 (diff) | |
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')
| -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) | |||
| 589 | s32 ret_val; | 589 | s32 ret_val; |
| 590 | u16 nvm_data; | 590 | u16 nvm_data; |
| 591 | 591 | ||
| 592 | if (mac->fc != e1000_fc_default) | ||
| 593 | return 0; | ||
| 594 | |||
| 595 | /* Read and store word 0x0F of the EEPROM. This word contains bits | 592 | /* Read and store word 0x0F of the EEPROM. This word contains bits |
| 596 | * that determine the hardware's default PAUSE (flow control) mode, | 593 | * that determine the hardware's default PAUSE (flow control) mode, |
| 597 | * a bit that determines whether the HW defaults to enabling or | 594 | * a bit that determines whether the HW defaults to enabling or |