1 From 0b6eb1e68290243d439ee330ea8d0b239a5aec69 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Sun, 27 Jul 2014 09:38:50 +0100
4 Subject: [PATCH 34/53] NET: multi phy support
6 Signed-off-by: John Crispin <blogic@openwrt.org>
8 drivers/net/phy/phy.c | 9 ++++++---
9 include/linux/phy.h | 1 +
10 2 files changed, 7 insertions(+), 3 deletions(-)
12 --- a/drivers/net/phy/phy.c
13 +++ b/drivers/net/phy/phy.c
14 @@ -913,7 +913,10 @@ void phy_state_machine(struct work_struc
15 /* If the link is down, give up on negotiation for now */
17 phydev->state = PHY_NOLINK;
18 - phy_link_down(phydev, true);
19 + if (!phydev->no_auto_carrier_off)
20 + phy_link_down(phydev, true);
22 + phy_link_down(phydev, false);
26 @@ -1000,7 +1003,10 @@ void phy_state_machine(struct work_struc
29 phydev->state = PHY_NOLINK;
30 - phy_link_down(phydev, true);
31 + if (!phydev->no_auto_carrier_off)
32 + phy_link_down(phydev, true);
34 + phy_link_down(phydev, false);
37 if (phy_interrupt_is_valid(phydev))
38 @@ -1010,7 +1016,10 @@ void phy_state_machine(struct work_struc
42 - phy_link_down(phydev, true);
43 + if (!phydev->no_auto_carrier_off)
44 + phy_link_down(phydev, true);
46 + phy_link_down(phydev, false);
50 --- a/include/linux/phy.h
51 +++ b/include/linux/phy.h
52 @@ -412,6 +412,7 @@ struct phy_device {
55 bool loopback_enabled;
56 + bool no_auto_carrier_off;