diff options
| author | Alex Chiang <achiang@hp.com> | 2009-02-05 23:55:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-05 23:55:45 -0800 |
| commit | 612e244c12215f6f74973ea3b89bff96450dc530 (patch) | |
| tree | 09d16139ec3e0681e4b682b3ebdccddbb245f0cb | |
| parent | 34b0368c6864321c7020ddc8cbaec9a63b4e3de8 (diff) | |
| download | linux-3.10-612e244c12215f6f74973ea3b89bff96450dc530.tar.gz linux-3.10-612e244c12215f6f74973ea3b89bff96450dc530.tar.bz2 linux-3.10-612e244c12215f6f74973ea3b89bff96450dc530.zip | |
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>
| -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 e48956d924b..2557aeef65e 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) *data = 0; if (hw->phy.media_type == e1000_media_type_internal_serdes) { int i = 0; - hw->mac.serdes_has_link = 0; + hw->mac.serdes_has_link = false; /* * On some blade server designs, link establishment diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 66741104ffd..ac2f34e1836 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) ew32(TXCW, mac->txcw); ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); - mac->serdes_has_link = 1; + mac->serdes_has_link = true; } return 0; @@ -566,7 +566,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw) ew32(TXCW, mac->txcw); ew32(CTRL, (ctrl & ~E1000_CTRL_SLU)); - mac->serdes_has_link = 1; + mac->serdes_has_link = true; } else if (!(E1000_TXCW_ANE & er32(TXCW))) { /* * If we force link for non-auto-negotiation switch, check |