From 9a065fcfecbf344812a92dbd9b28298da7ef2b74 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 12 Mar 2017 12:30:30 +0100 Subject: kernel: update kernel 4.9 to 4.9.14 Signed-off-by: Hauke Mehrtens --- .../linux/mediatek/patches-4.9/0001-NET-multi-phy-support.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/mediatek/patches-4.9/0001-NET-multi-phy-support.patch') diff --git a/target/linux/mediatek/patches-4.9/0001-NET-multi-phy-support.patch b/target/linux/mediatek/patches-4.9/0001-NET-multi-phy-support.patch index b60eac0efc..91d8792eac 100644 --- a/target/linux/mediatek/patches-4.9/0001-NET-multi-phy-support.patch +++ b/target/linux/mediatek/patches-4.9/0001-NET-multi-phy-support.patch @@ -11,7 +11,7 @@ Signed-off-by: John Crispin --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -890,7 +890,8 @@ void phy_state_machine(struct work_struc +@@ -996,7 +996,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 phydev->adjust_link(phydev->attached_dev); break; } -@@ -973,7 +974,8 @@ void phy_state_machine(struct work_struc +@@ -1079,7 +1080,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 } phydev->adjust_link(phydev->attached_dev); -@@ -985,7 +987,8 @@ void phy_state_machine(struct work_struc +@@ -1091,7 +1093,8 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; @@ -43,7 +43,7 @@ Signed-off-by: John Crispin } --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -377,6 +377,7 @@ struct phy_device { +@@ -373,6 +373,7 @@ struct phy_device { bool is_pseudo_fixed_link; bool has_fixups; bool suspended; -- cgit v1.2.3