| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 |
- From c30a296646a42302065ba452abe95b0b4b550883 Mon Sep 17 00:00:00 2001
- From: John Crispin <[email protected]>
- Date: Sun, 27 Jul 2014 09:38:50 +0100
- Subject: [PATCH 01/78] NET: multi phy support
- Signed-off-by: John Crispin <[email protected]>
- ---
- drivers/net/phy/phy.c | 9 ++++++---
- include/linux/phy.h | 1 +
- 2 files changed, 7 insertions(+), 3 deletions(-)
- diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
- index 47cd306..f69d12f 100644
- --- a/drivers/net/phy/phy.c
- +++ b/drivers/net/phy/phy.c
- @@ -844,7 +844,8 @@ void phy_state_machine(struct work_struct *work)
- /* If the link is down, give up on 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;
- }
- @@ -927,7 +928,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);
- @@ -939,7 +941,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);
- do_suspend = true;
- }
- diff --git a/include/linux/phy.h b/include/linux/phy.h
- index 05fde31..276ab8a 100644
- --- a/include/linux/phy.h
- +++ b/include/linux/phy.h
- @@ -377,6 +377,7 @@ struct phy_device {
- bool is_pseudo_fixed_link;
- bool has_fixups;
- bool suspended;
- + bool no_auto_carrier_off;
-
- enum phy_state state;
-
- --
- 1.7.10.4
|
