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

Commit 11e122cb authored by Shaohui Xie's avatar Shaohui Xie Committed by David S. Miller
Browse files

net: phy: fix PHY_RUNNING in phy_state_machine 



Currently, if phy state is PHY_RUNNING, we always register a CHANGE
when phy works in polling or interrupt ignored, this will make the
adjust_link being called even the phy link did Not changed.

checking the phy link to make sure the link did changed before we
register a CHANGE, if link did not changed, we do nothing.

Signed-off-by: default avatarShaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d37852b

drivers/net/phy/phy.c

+12 −4
Original line number Diff line number Diff line
@@ -811,6 +811,7 @@ void phy_state_machine(struct work_struct *work) 
	bool needs_aneg = false, do_suspend = false;

	enum phy_state old_state;

	int err = 0;

	int old_link;



	mutex_lock(&phydev->lock);
@@ -896,11 +897,18 @@ void phy_state_machine(struct work_struct *work) 
		phydev->adjust_link(phydev->attached_dev);

		break;

	case PHY_RUNNING:

		/* Only register a CHANGE if we are

		 * polling or ignoring interrupts

		/* Only register a CHANGE if we are polling or ignoring

		 * interrupts and link changed since latest checking.

		 */

		if (!phy_interrupt_is_valid(phydev))

		if (!phy_interrupt_is_valid(phydev)) {

			old_link = phydev->link;

			err = phy_read_status(phydev);

			if (err)

				break;



			if (old_link != phydev->link)

				phydev->state = PHY_CHANGELINK;

		}

		break;

	case PHY_CHANGELINK:

		err = phy_read_status(phydev);