aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.10/721-NET-no-auto-carrier-off-support.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-03-06 11:23:38 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-03-06 11:23:38 +0100
commitcc4ee2eeb465c1f4404b91852e6c86a43923c55e (patch)
tree84d07be2fb63d7b3d5fa82ff086f0a38fe017a51 /target/linux/ramips/patches-5.10/721-NET-no-auto-carrier-off-support.patch
parent20b6e014a61a9b40c30fab8184a9abd17f55085b (diff)
downloadupstream-cc4ee2eeb465c1f4404b91852e6c86a43923c55e.tar.gz
upstream-cc4ee2eeb465c1f4404b91852e6c86a43923c55e.tar.bz2
upstream-cc4ee2eeb465c1f4404b91852e6c86a43923c55e.zip
Revert "ramips: add support for kernel 5.10"
This reverts commit b4aad29a1d7ad77d67073c1c54b28c429c64ed9b. This was accidentally folded into a single commit. Remove it and apply it properly again. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ramips/patches-5.10/721-NET-no-auto-carrier-off-support.patch')
-rw-r--r--target/linux/ramips/patches-5.10/721-NET-no-auto-carrier-off-support.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/target/linux/ramips/patches-5.10/721-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-5.10/721-NET-no-auto-carrier-off-support.patch
deleted file mode 100644
index 09170ab632..0000000000
--- a/target/linux/ramips/patches-5.10/721-NET-no-auto-carrier-off-support.patch
+++ /dev/null
@@ -1,47 +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
-@@ -758,7 +758,10 @@ static int phy_check_link_status(struct
- phy_link_up(phydev);
- } else if (!phydev->link && phydev->state != PHY_NOLINK) {
- phydev->state = PHY_NOLINK;
-- phy_link_down(phydev, true);
-+ if (!phydev->no_auto_carrier_off)
-+ phy_link_down(phydev, true);
-+ else
-+ phy_link_down(phydev, false);
- }
-
- return 0;
-@@ -1162,7 +1165,10 @@ void phy_state_machine(struct work_struc
- case PHY_HALTED:
- if (phydev->link) {
- phydev->link = 0;
-- phy_link_down(phydev, true);
-+ if (!phydev->no_auto_carrier_off)
-+ phy_link_down(phydev, true);
-+ else
-+ phy_link_down(phydev, false);
- }
- do_suspend = true;
- break;
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -556,6 +556,7 @@ struct phy_device {
- unsigned sysfs_links:1;
- unsigned loopback_enabled:1;
- unsigned downshifted_rate:1;
-+ unsigned no_auto_carrier_off:1;
-
- unsigned autoneg:1;
- /* The most recently read link state */