diff options
author | John Crispin <blogic@openwrt.org> | 2015-03-16 07:39:52 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2015-03-16 07:39:52 +0000 |
commit | ed1a519c4056a21adde2ca81c1919951329bf9b0 (patch) | |
tree | 99effefe0c09a7f8ef9e0c6f0818c23611a2cd43 /target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch | |
parent | c59b0d680a93e745d8606dbd69843137e51d12c6 (diff) | |
download | upstream-ed1a519c4056a21adde2ca81c1919951329bf9b0.tar.gz upstream-ed1a519c4056a21adde2ca81c1919951329bf9b0.tar.bz2 upstream-ed1a519c4056a21adde2ca81c1919951329bf9b0.zip |
lantiq: drop 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44812 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 53 |
1 files changed, 0 insertions, 53 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 deleted file mode 100644 index 1601015a45..0000000000 --- a/target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c6feeeb407a3b8a6597ae377ba4dd138e185e3dd Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Sun, 27 Jul 2014 09:38:50 +0100 -Subject: [PATCH 26/36] NET: multi phy support - -Signed-off-by: John Crispin <blogic@openwrt.org> ---- - drivers/net/phy/phy.c | 9 ++++++--- - include/linux/phy.h | 1 + - 2 files changed, 7 insertions(+), 3 deletions(-) - ---- a/drivers/net/phy/phy.c -+++ b/drivers/net/phy/phy.c -@@ -764,7 +764,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; -- netif_carrier_off(phydev->attached_dev); -+ if (!phydev->no_auto_carrier_off) -+ netif_carrier_off(phydev->attached_dev); - phydev->adjust_link(phydev->attached_dev); - break; - } -@@ -841,7 +842,8 @@ void phy_state_machine(struct work_struc - netif_carrier_on(phydev->attached_dev); - } else { - phydev->state = PHY_NOLINK; -- netif_carrier_off(phydev->attached_dev); -+ if (!phydev->no_auto_carrier_off) -+ netif_carrier_off(phydev->attached_dev); - } - - phydev->adjust_link(phydev->attached_dev); -@@ -853,7 +855,8 @@ void phy_state_machine(struct work_struc - case PHY_HALTED: - if (phydev->link) { - phydev->link = 0; -- netif_carrier_off(phydev->attached_dev); -+ if (!phydev->no_auto_carrier_off) -+ netif_carrier_off(phydev->attached_dev); - phydev->adjust_link(phydev->attached_dev); - do_suspend = true; - } ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -308,6 +308,7 @@ struct phy_device { - struct phy_c45_device_ids c45_ids; - bool is_c45; - bool is_internal; -+ bool no_auto_carrier_off; - - enum phy_state state; - |