aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-04-06 18:20:46 +0200
committerFelix Fietkau <nbd@nbd.name>2018-04-06 18:21:45 +0200
commitdea9922acd290b37a784d354892a44684a8fb696 (patch)
tree6882d6c6a6b0166ed11842edea35ace83c7e592d /target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch
parent804952e7ef045e2ed68a1434dbc7371057495968 (diff)
downloadupstream-dea9922acd290b37a784d354892a44684a8fb696.tar.gz
upstream-dea9922acd290b37a784d354892a44684a8fb696.tar.bz2
upstream-dea9922acd290b37a784d354892a44684a8fb696.zip
ramips: drop linux 4.9 support
4.14 has been tested a lot by a number of users, and we want to use it for the release. Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch')
-rw-r--r--target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch b/target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch
deleted file mode 100644
index 4d7f590285..0000000000
--- a/target/linux/ramips/patches-4.9/0034-NET-multi-phy-support.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0b6eb1e68290243d439ee330ea8d0b239a5aec69 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Sun, 27 Jul 2014 09:38:50 +0100
-Subject: [PATCH 34/53] 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
-@@ -1032,7 +1032,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;
- }
-@@ -1124,7 +1125,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);
-@@ -1136,7 +1138,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
-@@ -369,6 +369,7 @@ struct phy_device {
- bool is_pseudo_fixed_link;
- bool has_fixups;
- bool suspended;
-+ bool no_auto_carrier_off;
-
- enum phy_state state;
-