From c00adb2a1ac75eaef1e71cd9819636b86eabebd9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 11 May 2013 23:40:19 +0200 Subject: [PATCH 70/79] NET: multi phy support Signed-off-by: John Crispin --- drivers/net/phy/phy.c | 9 ++++++--- include/linux/phy.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index ef9ea92..27f9b45 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -800,7 +800,8 @@ void phy_state_machine(struct work_struct *work) * 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; } @@ -891,7 +892,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); @@ -903,7 +905,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); } break; diff --git a/include/linux/phy.h b/include/linux/phy.h index 93b3cf7..c09b4ad 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -298,7 +298,7 @@ struct phy_device { struct phy_c45_device_ids c45_ids; bool is_c45; - + bool no_auto_carrier_off; enum phy_state state; u32 dev_flags; -- 1.7.10.4