diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 15:54:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 15:54:23 +0000 |
| commit | e7846156f23b109fd8789d60a4827171b06553a7 (patch) | |
| tree | f0bddd8d50cf4209c70dcd43e564be8706ae51ce /target/linux/lantiq/patches-4.1/0026-NET-multi-phy-support.patch | |
| parent | 9b4b2b4e17f10492798b14f7bb7e943ad86b4515 (diff) | |
| download | upstream-e7846156f23b109fd8789d60a4827171b06553a7.tar.gz upstream-e7846156f23b109fd8789d60a4827171b06553a7.tar.bz2 upstream-e7846156f23b109fd8789d60a4827171b06553a7.zip | |
lantiq: drop linux 4.1 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48323
Diffstat (limited to 'target/linux/lantiq/patches-4.1/0026-NET-multi-phy-support.patch')
| -rw-r--r-- | target/linux/lantiq/patches-4.1/0026-NET-multi-phy-support.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/target/linux/lantiq/patches-4.1/0026-NET-multi-phy-support.patch b/target/linux/lantiq/patches-4.1/0026-NET-multi-phy-support.patch deleted file mode 100644 index 2967bae2a9..0000000000 --- a/target/linux/lantiq/patches-4.1/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 -@@ -855,7 +855,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; - } -@@ -928,7 +929,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); -@@ -940,7 +942,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 -@@ -367,6 +367,7 @@ struct phy_device { - bool is_internal; - bool has_fixups; - bool suspended; -+ bool no_auto_carrier_off; - - enum phy_state state; - |