diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2017-09-28 10:39:05 +0100 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-29 07:42:43 +0300 |
commit | 657f2a1ff8f3f8b859bd10240394467ebf5ee05d (patch) | |
tree | ca071769223d719c18c69cd223eb06e3e350e515 /target/linux/mvebu/patches-4.4 | |
parent | 1d7042231b6bfe85a93181969200cf4b52ef9c7b (diff) | |
download | upstream-657f2a1ff8f3f8b859bd10240394467ebf5ee05d.tar.gz upstream-657f2a1ff8f3f8b859bd10240394467ebf5ee05d.tar.bz2 upstream-657f2a1ff8f3f8b859bd10240394467ebf5ee05d.zip |
kernel: update 4.4 to 4.4.89
Refresh patches.
Compile & run tested on ar71xx Archer C7 v2
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/mvebu/patches-4.4')
-rw-r--r-- | target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch b/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch index 75d30f6a08..a27e6baec3 100644 --- a/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch +++ b/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch @@ -22,7 +22,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -852,6 +852,16 @@ void phy_start(struct phy_device *phydev +@@ -849,6 +849,16 @@ void phy_start(struct phy_device *phydev } EXPORT_SYMBOL(phy_start); @@ -39,7 +39,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> /** * phy_state_machine - Handle the state machine * @work: work_struct that describes the work to be done -@@ -893,8 +903,7 @@ void phy_state_machine(struct work_struc +@@ -890,8 +900,7 @@ void phy_state_machine(struct work_struc /* If the link is down, give up on negotiation for now */ if (!phydev->link) { phydev->state = PHY_NOLINK; @@ -49,7 +49,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> break; } -@@ -906,9 +915,7 @@ void phy_state_machine(struct work_struc +@@ -903,9 +912,7 @@ void phy_state_machine(struct work_struc /* If AN is done, we're running */ if (err > 0) { phydev->state = PHY_RUNNING; @@ -60,7 +60,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> } else if (0 == phydev->link_timeout--) needs_aneg = true; break; -@@ -933,8 +940,7 @@ void phy_state_machine(struct work_struc +@@ -930,8 +937,7 @@ void phy_state_machine(struct work_struc } } phydev->state = PHY_RUNNING; @@ -70,7 +70,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> } break; case PHY_FORCING: -@@ -944,13 +950,12 @@ void phy_state_machine(struct work_struc +@@ -941,13 +947,12 @@ void phy_state_machine(struct work_struc if (phydev->link) { phydev->state = PHY_RUNNING; @@ -86,7 +86,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> break; case PHY_RUNNING: /* Only register a CHANGE if we are polling or ignoring -@@ -982,14 +987,12 @@ void phy_state_machine(struct work_struc +@@ -979,14 +984,12 @@ void phy_state_machine(struct work_struc if (phydev->link) { phydev->state = PHY_RUNNING; @@ -103,7 +103,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> if (phy_interrupt_is_valid(phydev)) err = phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED); -@@ -997,8 +1000,7 @@ void phy_state_machine(struct work_struc +@@ -994,8 +997,7 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; @@ -113,7 +113,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> do_suspend = true; } break; -@@ -1018,11 +1020,11 @@ void phy_state_machine(struct work_struc +@@ -1015,11 +1017,11 @@ void phy_state_machine(struct work_struc if (phydev->link) { phydev->state = PHY_RUNNING; @@ -127,7 +127,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> } else { phydev->state = PHY_AN; phydev->link_timeout = PHY_AN_TIMEOUT; -@@ -1034,11 +1036,11 @@ void phy_state_machine(struct work_struc +@@ -1031,11 +1033,11 @@ void phy_state_machine(struct work_struc if (phydev->link) { phydev->state = PHY_RUNNING; |