diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-02-08 15:09:45 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-02-08 15:09:45 +0000 |
| commit | 683da1384bc567d1a29544ca98f56dea4542cb3c (patch) | |
| tree | 206e0e80e66a93e8eee961cde4eaf207a413a060 /target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch | |
| parent | 7294b892dcc5e28a5180d6e9bb3fa9bb08e29493 (diff) | |
| download | upstream-683da1384bc567d1a29544ca98f56dea4542cb3c.tar.gz upstream-683da1384bc567d1a29544ca98f56dea4542cb3c.tar.bz2 upstream-683da1384bc567d1a29544ca98f56dea4542cb3c.zip | |
lantiq: fix patches after 3.14.32 bump
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 44320
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch b/target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch index 3bd2419daf..1601015a45 100644 --- a/target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch +++ b/target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch @@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> phydev->adjust_link(phydev->attached_dev); break; } -@@ -830,7 +831,8 @@ void phy_state_machine(struct work_struc +@@ -841,7 +842,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); -@@ -842,7 +844,8 @@ void phy_state_machine(struct work_struc +@@ -853,7 +855,8 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; @@ -39,7 +39,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + if (!phydev->no_auto_carrier_off) + netif_carrier_off(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev); - do_suspend = 1; + do_suspend = true; } --- a/include/linux/phy.h +++ b/include/linux/phy.h |