From: Jesse Brandeburg Date: Thu, 21 Feb 2008 23:10:57 +0000 (-0800) Subject: e1000e: fix flow control when using ethtool overrides X-Git-Tag: v2.6.25-rc4~148^2~41^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4a5694e66428607585c9f4dd14bcf4158d2de191;p=linux-2.6-omap-h63xx.git e1000e: fix flow control when using ethtool overrides Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 16f35fadb74..0860b5fb347 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