diff options
author | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
commit | 88655056656fdbd9d021d8de11a6077fb49428da (patch) | |
tree | d3b641c3c5876ee5e79c67034a95a8fd532a4077 /target/linux/generic/patches-3.14/073-net-phy-resume-phydev-when-going-to-RESUMING.patch | |
parent | b66b0ae6323fea7dedd400785c556a39a30cdf4f (diff) | |
download | upstream-88655056656fdbd9d021d8de11a6077fb49428da.tar.gz upstream-88655056656fdbd9d021d8de11a6077fb49428da.tar.bz2 upstream-88655056656fdbd9d021d8de11a6077fb49428da.zip |
generic: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 45375
Diffstat (limited to 'target/linux/generic/patches-3.14/073-net-phy-resume-phydev-when-going-to-RESUMING.patch')
-rw-r--r-- | target/linux/generic/patches-3.14/073-net-phy-resume-phydev-when-going-to-RESUMING.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/target/linux/generic/patches-3.14/073-net-phy-resume-phydev-when-going-to-RESUMING.patch b/target/linux/generic/patches-3.14/073-net-phy-resume-phydev-when-going-to-RESUMING.patch deleted file mode 100644 index bbe09f2b5d..0000000000 --- a/target/linux/generic/patches-3.14/073-net-phy-resume-phydev-when-going-to-RESUMING.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/drivers/net/phy/phy.c -+++ b/drivers/net/phy/phy.c -@@ -690,7 +690,7 @@ void phy_state_machine(struct work_struc - struct delayed_work *dwork = to_delayed_work(work); - struct phy_device *phydev = - container_of(dwork, struct phy_device, state_queue); -- int needs_aneg = 0, do_suspend = 0; -+ bool needs_aneg = false, do_suspend = false, do_resume = false; - int err = 0; - - mutex_lock(&phydev->lock); -@@ -702,7 +702,7 @@ void phy_state_machine(struct work_struc - case PHY_PENDING: - break; - case PHY_UP: -- needs_aneg = 1; -+ needs_aneg = true; - - phydev->link_timeout = PHY_AN_TIMEOUT; - -@@ -732,7 +732,7 @@ void phy_state_machine(struct work_struc - phydev->adjust_link(phydev->attached_dev); - - } else if (0 == phydev->link_timeout--) { -- needs_aneg = 1; -+ needs_aneg = true; - /* If we have the magic_aneg bit, we try again */ - if (phydev->drv->flags & PHY_HAS_MAGICANEG) - break; -@@ -770,7 +770,7 @@ void phy_state_machine(struct work_struc - netif_carrier_on(phydev->attached_dev); - } else { - if (0 == phydev->link_timeout--) -- needs_aneg = 1; -+ needs_aneg = true; - } - - phydev->adjust_link(phydev->attached_dev); -@@ -806,7 +806,7 @@ void phy_state_machine(struct work_struc - phydev->link = 0; - netif_carrier_off(phydev->attached_dev); - phydev->adjust_link(phydev->attached_dev); -- do_suspend = 1; -+ do_suspend = true; - } - break; - case PHY_RESUMING: -@@ -855,6 +855,7 @@ void phy_state_machine(struct work_struc - } - phydev->adjust_link(phydev->attached_dev); - } -+ do_resume = true; - break; - } - -@@ -862,9 +863,10 @@ void phy_state_machine(struct work_struc - - if (needs_aneg) - err = phy_start_aneg(phydev); -- -- if (do_suspend) -+ else if (do_suspend) - phy_suspend(phydev); -+ else if (do_resume) -+ phy_resume(phydev); - - if (err < 0) - phy_error(phydev); |