Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f92518dd authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

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



Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ec34c170

drivers/net/ethernet/intel/e1000e/netdev.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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);

drivers/net/ethernet/intel/e1000e/phy.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

}

}