53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From 1e021917e634b173d466bf0dd3d2ae84e51a77ff Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Sun, 27 Jul 2014 09:38:50 +0100
|
|
Subject: [PATCH 001/102] NET: multi phy support
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
drivers/net/phy/phy.c | 9 ++++++---
|
|
include/linux/phy.h | 1 +
|
|
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phy.c
|
|
+++ b/drivers/net/phy/phy.c
|
|
@@ -888,7 +888,8 @@ void phy_state_machine(struct work_struc
|
|
/* 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;
|
|
}
|
|
@@ -971,7 +972,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);
|
|
@@ -983,7 +985,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);
|
|
do_suspend = true;
|
|
}
|
|
--- 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;
|
|
|