diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2008-11-21 19:57:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-21 19:57:36 -0500 |
commit | 5c48ef3e2028677a890d46d9a38b19174274f2e9 (patch) | |
tree | 1ef4a75e9054eafa127609bd31f7999dc1fe085f /drivers/net/e1000e/phy.c | |
parent | 8f12fe8653eb699a6bc4f88f1a80312466ea2b0e (diff) |
e1000e: sync change flow control variables with ixgbe
Sync flow control variables and usage model with that found in the ixgbe
driver.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/phy.c')
-rw-r--r-- | drivers/net/e1000e/phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index cb7d71e458e4..dc4a9cba6a73 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c | |||
@@ -744,7 +744,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw) | |||
744 | * other: No software override. The flow control configuration | 744 | * other: No software override. The flow control configuration |
745 | * in the EEPROM is used. | 745 | * in the EEPROM is used. |
746 | */ | 746 | */ |
747 | switch (hw->fc.type) { | 747 | switch (hw->fc.current_mode) { |
748 | case e1000_fc_none: | 748 | case e1000_fc_none: |
749 | /* | 749 | /* |
750 | * Flow control (Rx & Tx) is completely disabled by a | 750 | * Flow control (Rx & Tx) is completely disabled by a |
@@ -1114,7 +1114,7 @@ void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl) | |||
1114 | u32 ctrl; | 1114 | u32 ctrl; |
1115 | 1115 | ||
1116 | /* Turn off flow control when forcing speed/duplex */ | 1116 | /* Turn off flow control when forcing speed/duplex */ |
1117 | hw->fc.type = e1000_fc_none; | 1117 | hw->fc.current_mode = e1000_fc_none; |
1118 | 1118 | ||
1119 | /* Force speed/duplex on the mac */ | 1119 | /* Force speed/duplex on the mac */ |
1120 | ctrl = er32(CTRL); | 1120 | ctrl = er32(CTRL); |