diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-07-23 14:10:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-26 12:47:02 -0400 |
commit | 0cce119aa977dba00467985c0ae93fe43d28740a (patch) | |
tree | 847330167dff04e7059b949a85c93d3ca9b4a054 /drivers/net/igb/e1000_phy.c | |
parent | 2d94d8ab76ea6c858c6e2eb0ab0403b00b031039 (diff) |
igb: cleanup flow control configuration to make requested/current more clear
This patch cleans up the flow control configuration for igb to make it a
bit more readable in regards to what the requested and current modes are.
This should help with the maintainability of the current igb driver in
regards to flow control.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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/igb/e1000_phy.c')
-rw-r--r-- | drivers/net/igb/e1000_phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c index f50fac25be40..c1f4da630420 100644 --- a/drivers/net/igb/e1000_phy.c +++ b/drivers/net/igb/e1000_phy.c | |||
@@ -735,7 +735,7 @@ static s32 igb_phy_setup_autoneg(struct e1000_hw *hw) | |||
735 | * other: No software override. The flow control configuration | 735 | * other: No software override. The flow control configuration |
736 | * in the EEPROM is used. | 736 | * in the EEPROM is used. |
737 | */ | 737 | */ |
738 | switch (hw->fc.type) { | 738 | switch (hw->fc.current_mode) { |
739 | case e1000_fc_none: | 739 | case e1000_fc_none: |
740 | /* | 740 | /* |
741 | * Flow control (RX & TX) is completely disabled by a | 741 | * Flow control (RX & TX) is completely disabled by a |
@@ -992,7 +992,7 @@ static void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw, | |||
992 | u32 ctrl; | 992 | u32 ctrl; |
993 | 993 | ||
994 | /* Turn off flow control when forcing speed/duplex */ | 994 | /* Turn off flow control when forcing speed/duplex */ |
995 | hw->fc.type = e1000_fc_none; | 995 | hw->fc.current_mode = e1000_fc_none; |
996 | 996 | ||
997 | /* Force speed/duplex on the mac */ | 997 | /* Force speed/duplex on the mac */ |
998 | ctrl = rd32(E1000_CTRL); | 998 | ctrl = rd32(E1000_CTRL); |