forked from Openwrt-EcoNet/openwrt
d798bef016
Automatic rebasing of patches. Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/18654 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
32 lines
895 B
Diff
32 lines
895 B
Diff
From: John Crispin <blogic@openwrt.org>
|
|
Date: Sun, 27 Jul 2014 09:38:50 +0100
|
|
Subject: [PATCH] NET: multi phy support
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
drivers/net/phy/phy_device.c | 2 +-
|
|
include/linux/phy.h | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -295,7 +295,7 @@ static void phy_link_change(struct phy_d
|
|
|
|
if (up)
|
|
netif_carrier_on(netdev);
|
|
- else
|
|
+ else if (!phydev->no_auto_carrier_off)
|
|
netif_carrier_off(netdev);
|
|
phydev->adjust_link(netdev);
|
|
if (phydev->mii_ts && phydev->mii_ts->link_state)
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -675,6 +675,7 @@ struct phy_device {
|
|
unsigned downshifted_rate:1;
|
|
unsigned is_on_sfp_module:1;
|
|
unsigned mac_managed_pm:1;
|
|
+ unsigned no_auto_carrier_off:1;
|
|
unsigned wol_enabled:1;
|
|
|
|
unsigned autoneg:1;
|