diff options
| author | John Crispin <blogic@openwrt.org> | 2015-02-09 12:13:25 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-02-09 12:13:25 +0000 |
| commit | d09e8adc85ecec168bc0e1eb926e7c160c9b906e (patch) | |
| tree | db27cf9bfa42aaabc0f5f73a4b6dcd8f4c490765 /target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch | |
| parent | f4502d48f72913102ec18f3434c2ad9136fd43c5 (diff) | |
| download | upstream-d09e8adc85ecec168bc0e1eb926e7c160c9b906e.tar.gz upstream-d09e8adc85ecec168bc0e1eb926e7c160c9b906e.tar.bz2 upstream-d09e8adc85ecec168bc0e1eb926e7c160c9b906e.zip | |
lantiq: add 3.18 support
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44348 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch b/target/linux/lantiq/patches-3.18/0026-NET-multi-phy-support.patch new file mode 100644 index 0000000000..3b8ff0c1c6 --- /dev/null +++ b/target/linux/lantiq/patches-3.18/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 +@@ -819,7 +819,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; + } +@@ -892,7 +893,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); +@@ -904,7 +906,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 +@@ -364,6 +364,7 @@ struct phy_device { + bool is_c45; + bool is_internal; + bool has_fixups; ++ bool no_auto_carrier_off; + + enum phy_state state; + |