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 @@ -738,7 +738,10 @@ static int phy_check_link_status(struct
16 } else if (!phydev->link && phydev->state != PHY_NOLINK) {
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 @@ -1224,7 +1227,10 @@ void phy_state_machine(struct work_struc
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);
38 --- a/include/linux/phy.h
39 +++ b/include/linux/phy.h
40 @@ -644,6 +644,7 @@ struct phy_device {
41 unsigned downshifted_rate:1;
42 unsigned is_on_sfp_module:1;
43 unsigned mac_managed_pm:1;
44 + unsigned no_auto_carrier_off:1;
47 /* The most recently read link state */