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 @@ -888,7 +888,8 @@ 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 - netif_carrier_off(phydev->attached_dev);
19 + if (!phydev->no_auto_carrier_off)
20 + netif_carrier_off(phydev->attached_dev);
21 phydev->adjust_link(phydev->attached_dev);
24 @@ -971,7 +972,8 @@ void phy_state_machine(struct work_struc
25 netif_carrier_on(phydev->attached_dev);
27 phydev->state = PHY_NOLINK;
28 - netif_carrier_off(phydev->attached_dev);
29 + if (!phydev->no_auto_carrier_off)
30 + netif_carrier_off(phydev->attached_dev);
33 phydev->adjust_link(phydev->attached_dev);
34 @@ -983,7 +985,8 @@ void phy_state_machine(struct work_struc
38 - netif_carrier_off(phydev->attached_dev);
39 + if (!phydev->no_auto_carrier_off)
40 + netif_carrier_off(phydev->attached_dev);
41 phydev->adjust_link(phydev->attached_dev);
44 --- a/include/linux/phy.h
45 +++ b/include/linux/phy.h
46 @@ -377,6 +377,7 @@ struct phy_device {
47 bool is_pseudo_fixed_link;
50 + bool no_auto_carrier_off;