diff options
author | John Crispin <blogic@openwrt.org> | 2014-09-12 06:50:46 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2014-09-12 06:50:46 +0000 |
commit | 0547b47537b53201f96f49d95843e906d8bd166e (patch) | |
tree | 925df671f3cd1771a2b45a1bea40bdc932eeb0cc /target/linux/ramips/patches-3.10/0116-NET-multi-phy-support.patch | |
parent | 8f4435db9207b8341370f1844ff273646c4d3e49 (diff) | |
download | master-187ad058-0547b47537b53201f96f49d95843e906d8bd166e.tar.gz master-187ad058-0547b47537b53201f96f49d95843e906d8bd166e.tar.bz2 master-187ad058-0547b47537b53201f96f49d95843e906d8bd166e.zip |
ralink: drop 3.10 support
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42481 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.10/0116-NET-multi-phy-support.patch')
-rw-r--r-- | target/linux/ramips/patches-3.10/0116-NET-multi-phy-support.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/target/linux/ramips/patches-3.10/0116-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.10/0116-NET-multi-phy-support.patch deleted file mode 100644 index 218d0828dd..0000000000 --- a/target/linux/ramips/patches-3.10/0116-NET-multi-phy-support.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bed88d4cb806d2738528cb7d368d6df79d9c1424 Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Sat, 11 May 2013 23:40:19 +0200 -Subject: [PATCH 116/133] NET: multi phy support - -Signed-off-by: John Crispin <blogic@openwrt.org> ---- - 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; |