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

Commit 612e244c authored Feb 05, 2009 by Alex Chiang Committed by David S. Miller Feb 05, 2009

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>

parent 34b0368c

drivers/net/e1000e/ethtool.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

drivers/net/e1000e/lib.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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