UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

e1000e: replace '1' with 'true' for boolean get_link_status 

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Bruce Allan 2012-02-01 11:16:42 +00:00 committed by Jeff Kirsher
parent ec34c170da
commit f92518ddec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/intel/e1000e/netdev.c
View File

@ -1652,7 +1652,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
*/ */
if (icr & E1000_ICR_LSC) { if (icr & E1000_ICR_LSC) {
hw->mac.get_link_status = 1; hw->mac.get_link_status = true;
/* /*
* ICH8 workaround-- Call gig speed drop workaround on cable * ICH8 workaround-- Call gig speed drop workaround on cable
* disconnect (LSC) before accessing any PHY registers * disconnect (LSC) before accessing any PHY registers
@ -1718,7 +1718,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
*/ */
if (icr & E1000_ICR_LSC) { if (icr & E1000_ICR_LSC) {
hw->mac.get_link_status = 1; hw->mac.get_link_status = true;
/* /*
* ICH8 workaround-- Call gig speed drop workaround on cable * ICH8 workaround-- Call gig speed drop workaround on cable
* disconnect (LSC) before accessing any PHY registers * disconnect (LSC) before accessing any PHY registers
@ -1775,7 +1775,7 @@ static irqreturn_t e1000_msix_other(int irq, void *data)
if (icr & E1000_ICR_OTHER) { if (icr & E1000_ICR_OTHER) {
if (!(icr & E1000_ICR_LSC)) if (!(icr & E1000_ICR_LSC))
goto no_link_interrupt; goto no_link_interrupt;
hw->mac.get_link_status = 1; hw->mac.get_link_status = true;
/* guard against interrupt when we're going down */ /* guard against interrupt when we're going down */
if (!test_bit(__E1000_DOWN, &adapter->state)) if (!test_bit(__E1000_DOWN, &adapter->state))
mod_timer(&adapter->watchdog_timer, jiffies + 1); mod_timer(&adapter->watchdog_timer, jiffies + 1);

2
drivers/net/ethernet/intel/e1000e/phy.c
View File

@ -1141,7 +1141,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
} }
} }
hw->mac.get_link_status = 1; hw->mac.get_link_status = true;
return ret_val; return ret_val;
} }