1 From 611c89720d9992d54da93bd946000c574d23f2b7 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Sat, 11 May 2013 23:40:19 +0200
4 Subject: [PATCH 157/164] 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 | 2 +-
10 2 files changed, 7 insertions(+), 4 deletions(-)
12 --- a/drivers/net/phy/phy.c
13 +++ b/drivers/net/phy/phy.c
14 @@ -847,7 +847,8 @@ void phy_state_machine(struct work_struc
15 * 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 @@ -938,7 +939,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 @@ -950,7 +952,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 @@ -298,7 +298,7 @@ struct phy_device {
48 struct phy_c45_device_ids c45_ids;
51 + bool no_auto_carrier_off;