diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-01-18 09:25:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-18 09:25:32 +0000 |
| commit | 018a2a5a8641db64320d2b840e3e9e442519929c (patch) | |
| tree | 18e863b7f36d3b1c573872ec8fc3ec79b4780cc8 /target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch | |
| parent | dc9e6416e7d60accd5974583540042d29e70f7b4 (diff) | |
| download | master-187ad058-018a2a5a8641db64320d2b840e3e9e442519929c.tar.gz master-187ad058-018a2a5a8641db64320d2b840e3e9e442519929c.tar.bz2 master-187ad058-018a2a5a8641db64320d2b840e3e9e442519929c.zip | |
ramips: refresh kernel patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44025 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch index 45028f5840..b337f5b78e 100644 --- a/target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch +++ b/target/linux/ramips/patches-3.14/0033-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 |