diff options
| author | John Crispin <blogic@openwrt.org> | 2014-09-11 17:49:57 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-09-11 17:49:57 +0000 |
| commit | 6dac0c08725283e256e867830fb204d004ac752c (patch) | |
| tree | 9c8086343821d3106c770efd2e42e1959ad55cb8 /target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch | |
| parent | 5af0ac95ab03fba96f9f8b4eabe8620b966ab217 (diff) | |
| download | upstream-6dac0c08725283e256e867830fb204d004ac752c.tar.gz upstream-6dac0c08725283e256e867830fb204d004ac752c.tar.bz2 upstream-6dac0c08725283e256e867830fb204d004ac752c.zip | |
lantiq: update 3.14 patches
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42476 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 | 60 |
1 files changed, 60 insertions, 0 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 new file mode 100644 index 0000000000..9ffc6805a2 --- /dev/null +++ b/target/linux/lantiq/patches-3.14/0026-NET-multi-phy-support.patch @@ -0,0 +1,60 @@ +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(-) + +diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c +index 76d96b9..371f0b6 100644 +--- a/drivers/net/phy/phy.c ++++ b/drivers/net/phy/phy.c +@@ -715,7 +715,8 @@ void phy_state_machine(struct work_struct *work) + /* 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; + } +@@ -781,7 +782,8 @@ void phy_state_machine(struct work_struct *work) + 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); +@@ -793,7 +795,8 @@ void phy_state_machine(struct work_struct *work) + 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 = 1; + } +diff --git a/include/linux/phy.h b/include/linux/phy.h +index 565188c..91b93f7 100644 +--- 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; + +-- +1.7.10.4 + |