From bed88d4cb806d2738528cb7d368d6df79d9c1424 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 11 May 2013 23:40:19 +0200 Subject: [PATCH 116/133] 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(-) --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -820,7 +820,8 @@ void phy_state_machine(struct work_struc * 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; } @@ -890,7 +891,8 @@ void phy_state_machine(struct work_struc 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); @@ -902,7 +904,8 @@ void phy_state_machine(struct work_struc 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; --- 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;