From 91482cc765026d9dfe0472be92b5735004efe3b1 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Thu, 21 Feb 2008 15:10:57 -0800 Subject: [PATCH] --- yaml --- r: 86455 b: refs/heads/master c: 4a5694e66428607585c9f4dd14bcf4158d2de191 h: refs/heads/master i: 86453: 4c75395d85693059c0caabd743591ad0c4510fe0 86451: 24de96e82eab0b63402261a83cf5413a940372cb 86447: 1dbd240d8e4299b7c9d2acf30d39f3b242e63051 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/lib.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 354ddefcbb3a..9f836d014a2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03ae221fe9987e22679642b5b687aebbb67bbb47 +refs/heads/master: 4a5694e66428607585c9f4dd14bcf4158d2de191 diff --git a/trunk/drivers/net/e1000e/lib.c b/trunk/drivers/net/e1000e/lib.c index 16f35fadb74b..0860b5fb3471 100644 --- a/trunk/drivers/net/e1000e/lib.c +++ b/trunk/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