mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-21 06:24:12 +00:00
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>
This commit is contained in:
parent
34b0368c68
commit
612e244c12
2 changed files with 3 additions and 3 deletions
|
@ -1589,7 +1589,7 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
|
||||||
*data = 0;
|
*data = 0;
|
||||||
if (hw->phy.media_type == e1000_media_type_internal_serdes) {
|
if (hw->phy.media_type == e1000_media_type_internal_serdes) {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
hw->mac.serdes_has_link = 0;
|
hw->mac.serdes_has_link = false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* On some blade server designs, link establishment
|
* On some blade server designs, link establishment
|
||||||
|
|
|
@ -501,7 +501,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
|
||||||
ew32(TXCW, mac->txcw);
|
ew32(TXCW, mac->txcw);
|
||||||
ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
|
ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
|
||||||
|
|
||||||
mac->serdes_has_link = 1;
|
mac->serdes_has_link = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -566,7 +566,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
|
||||||
ew32(TXCW, mac->txcw);
|
ew32(TXCW, mac->txcw);
|
||||||
ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
|
ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
|
||||||
|
|
||||||
mac->serdes_has_link = 1;
|
mac->serdes_has_link = true;
|
||||||
} else if (!(E1000_TXCW_ANE & er32(TXCW))) {
|
} else if (!(E1000_TXCW_ANE & er32(TXCW))) {
|
||||||
/*
|
/*
|
||||||
* If we force link for non-auto-negotiation switch, check
|
* If we force link for non-auto-negotiation switch, check
|
||||||
|
|
Loading…
Add table
Reference in a new issue