diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-11-12 22:27:14 +0100 |
---|---|---|
committer | Mathias Kresin <dev@kresin.me> | 2018-02-20 19:25:17 +0100 |
commit | 5eeaba31b8fad26d6ed0f1b52a7f156d838326b8 (patch) | |
tree | 68cf1e63fe05965a5b6ad7ad096ba33589126329 /target/linux/lantiq/patches-4.14/0026-NET-multi-phy-support.patch | |
parent | 73ba5e11f7582967f5151f5a3cb27932b47f44fa (diff) | |
download | upstream-5eeaba31b8fad26d6ed0f1b52a7f156d838326b8.tar.gz upstream-5eeaba31b8fad26d6ed0f1b52a7f156d838326b8.tar.bz2 upstream-5eeaba31b8fad26d6ed0f1b52a7f156d838326b8.zip |
lantiq: kernel 4.14: copy patches, config and dts files
This just copies the patches, configuration and dts files into the
directories hich are used for kernel 4.14.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/lantiq/patches-4.14/0026-NET-multi-phy-support.patch')
-rw-r--r-- | target/linux/lantiq/patches-4.14/0026-NET-multi-phy-support.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-4.14/0026-NET-multi-phy-support.patch b/target/linux/lantiq/patches-4.14/0026-NET-multi-phy-support.patch new file mode 100644 index 0000000000..6046d6cde1 --- /dev/null +++ b/target/linux/lantiq/patches-4.14/0026-NET-multi-phy-support.patch @@ -0,0 +1,53 @@ +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 +@@ -1032,7 +1032,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; + } +@@ -1124,7 +1125,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); +@@ -1136,7 +1138,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 +@@ -369,6 +369,7 @@ struct phy_device { + bool is_pseudo_fixed_link; + bool has_fixups; + bool suspended; ++ bool no_auto_carrier_off; + + enum phy_state state; + |