diff options
author | Alex Chiang <achiang@hp.com> | 2009-02-06 02:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-06 02:55:45 -0500 |
commit | 612e244c12215f6f74973ea3b89bff96450dc530 (patch) | |
tree | 09d16139ec3e0681e4b682b3ebdccddbb245f0cb /drivers/net/e1000e | |
parent | 34b0368c6864321c7020ddc8cbaec9a63b4e3de8 (diff) |
e1000e: normalize usage of serdes_has_link
Cosmetic change to use struct e1000_mac_info.serdes_has_link
consistently as the 'bool' that it's declared as.
No functional change.
Signed-off-by: Alex Chiang <achiang@hp.com>
Acked-by: Jeff Kirsher <Jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r-- | drivers/net/e1000e/ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/e1000e/lib.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index e48956d924b0..2557aeef65e6 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
@@ -1589,7 +1589,7 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data) | |||
1589 | *data = 0; | 1589 | *data = 0; |
1590 | if (hw->phy.media_type == e1000_media_type_internal_serdes) { | 1590 | if (hw->phy.media_type == e1000_media_type_internal_serdes) { |
1591 | int i = 0; | 1591 | int i = 0; |
1592 | hw->mac.serdes_has_link = 0; | 1592 | hw->mac.serdes_has_link = false; |
1593 | 1593 | ||
1594 | /* | 1594 | /* |
1595 | * On some blade server designs, link establishment | 1595 | * On some blade server designs, link establishment |
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 66741104ffd1..ac2f34e1836d 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c | |||
@@ -501,7 +501,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw) | |||
501 | ew32(TXCW, mac->txcw); | 501 | ew32(TXCW, mac->txcw); |
502 | ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); | 502 | ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); |
503 | 503 | ||
504 | mac->serdes_has_link = 1; | 504 | mac->serdes_has_link = true; |
505 | } | 505 | } |
506 | 506 | ||
507 | return 0; | 507 | return 0; |
@@ -566,7 +566,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw) | |||
566 | ew32(TXCW, mac->txcw); | 566 | ew32(TXCW, mac->txcw); |
567 | ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); | 567 | ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); |
568 | 568 | ||
569 | mac->serdes_has_link = 1; | 569 | mac->serdes_has_link = true; |
570 | } else if (!(E1000_TXCW_ANE & er32(TXCW))) { | 570 | } else if (!(E1000_TXCW_ANE & er32(TXCW))) { |
571 | /* | 571 | /* |
572 | * If we force link for non-auto-negotiation switch, check | 572 | * If we force link for non-auto-negotiation switch, check |