diff options
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/phy.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 7ccd5f3cef61..f868fb822a30 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -1652,7 +1652,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data) | |||
1652 | */ | 1652 | */ |
1653 | 1653 | ||
1654 | if (icr & E1000_ICR_LSC) { | 1654 | if (icr & E1000_ICR_LSC) { |
1655 | hw->mac.get_link_status = 1; | 1655 | hw->mac.get_link_status = true; |
1656 | /* | 1656 | /* |
1657 | * ICH8 workaround-- Call gig speed drop workaround on cable | 1657 | * ICH8 workaround-- Call gig speed drop workaround on cable |
1658 | * disconnect (LSC) before accessing any PHY registers | 1658 | * disconnect (LSC) before accessing any PHY registers |
@@ -1718,7 +1718,7 @@ static irqreturn_t e1000_intr(int irq, void *data) | |||
1718 | */ | 1718 | */ |
1719 | 1719 | ||
1720 | if (icr & E1000_ICR_LSC) { | 1720 | if (icr & E1000_ICR_LSC) { |
1721 | hw->mac.get_link_status = 1; | 1721 | hw->mac.get_link_status = true; |
1722 | /* | 1722 | /* |
1723 | * ICH8 workaround-- Call gig speed drop workaround on cable | 1723 | * ICH8 workaround-- Call gig speed drop workaround on cable |
1724 | * disconnect (LSC) before accessing any PHY registers | 1724 | * disconnect (LSC) before accessing any PHY registers |
@@ -1775,7 +1775,7 @@ static irqreturn_t e1000_msix_other(int irq, void *data) | |||
1775 | if (icr & E1000_ICR_OTHER) { | 1775 | if (icr & E1000_ICR_OTHER) { |
1776 | if (!(icr & E1000_ICR_LSC)) | 1776 | if (!(icr & E1000_ICR_LSC)) |
1777 | goto no_link_interrupt; | 1777 | goto no_link_interrupt; |
1778 | hw->mac.get_link_status = 1; | 1778 | hw->mac.get_link_status = true; |
1779 | /* guard against interrupt when we're going down */ | 1779 | /* guard against interrupt when we're going down */ |
1780 | if (!test_bit(__E1000_DOWN, &adapter->state)) | 1780 | if (!test_bit(__E1000_DOWN, &adapter->state)) |
1781 | mod_timer(&adapter->watchdog_timer, jiffies + 1); | 1781 | mod_timer(&adapter->watchdog_timer, jiffies + 1); |
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c index e8ad0804702f..6f44c3fb80b6 100644 --- a/drivers/net/ethernet/intel/e1000e/phy.c +++ b/drivers/net/ethernet/intel/e1000e/phy.c | |||
@@ -1141,7 +1141,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw) | |||
1141 | } | 1141 | } |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | hw->mac.get_link_status = 1; | 1144 | hw->mac.get_link_status = true; |
1145 | 1145 | ||
1146 | return ret_val; | 1146 | return ret_val; |
1147 | } | 1147 | } |