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

Commit 7564a888 authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Use MDIO_PRTAD_NONE consistently 



The value MDIO_PRTAD_NONE should be used to indicate no PHY address.
Not 0, not 0xFFFF. Use the MDIO_PRTAD_NONE value consistently.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 14b22cd9

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+2 −2
Original line number Diff line number Diff line
@@ -346,8 +346,8 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw) 
				return 0;

			}

		}

		/* clear value if nothing found */

		hw->phy.mdio.prtad = 0;

		/* indicate no PHY found */

		hw->phy.mdio.prtad = MDIO_PRTAD_NONE;

		return IXGBE_ERR_PHY_ADDR_INVALID;

	}

	return 0;

drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c

+1 −1
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw, ixgbe_link_speed speed, 
	/* Configure internal PHY for KR/KX. */

	ixgbe_setup_kr_speed_x550em(hw, speed);



	if (!hw->phy.mdio.prtad || hw->phy.mdio.prtad == 0xFFFF)

	if (hw->phy.mdio.prtad == MDIO_PRTAD_NONE)

		return IXGBE_ERR_PHY_ADDR_INVALID;



	/* Get external PHY device id */