aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-4.9
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-03-26 12:22:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2017-03-26 12:23:19 +0200
commitfb7ea71c15d2bccb8cc6383d3a08921b79713712 (patch)
tree402344f7b2dc8600fb8b8d1ae60eb05f1e3458a8 /target/linux/lantiq/patches-4.9
parent88b125e9a46dd8793aa5eaef8c148e851ceb7463 (diff)
downloadupstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.tar.gz
upstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.tar.bz2
upstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.zip
kernel: update kernel 4.9 to 4.9.17
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/lantiq/patches-4.9')
-rw-r--r--target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch b/target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch
index b99670fcb5..a25e87a9cc 100644
--- a/target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch
+++ b/target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -996,7 +996,8 @@ void phy_state_machine(struct work_struc
+@@ -1000,7 +1000,8 @@ 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;
@@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
phydev->adjust_link(phydev->attached_dev);
break;
}
-@@ -1079,7 +1080,8 @@ void phy_state_machine(struct work_struc
+@@ -1083,7 +1084,8 @@ void phy_state_machine(struct work_struc
netif_carrier_on(phydev->attached_dev);
} else {
phydev->state = PHY_NOLINK;
@@ -31,7 +31,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
}
phydev->adjust_link(phydev->attached_dev);
-@@ -1091,7 +1093,8 @@ void phy_state_machine(struct work_struc
+@@ -1095,7 +1097,8 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;