aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.4
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-11-06 19:29:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-07 01:10:53 +0100
commit0b7311300b01d9975e9996327ee469e4f66fb2ec (patch)
tree69c7696ae97c3478df893c55458759a8dc0032ba /target/linux/ramips/patches-5.4
parent2f04012b20515eec74563de74d0528e603aa6f89 (diff)
downloadupstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.gz
upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.bz2
upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.zip
kernel: bump 5.4 to 5.4.158
Removed upstreamed: generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ramips/patches-5.4')
-rw-r--r--target/linux/ramips/patches-5.4/200-add-ralink-eth.patch2
-rw-r--r--target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-5.4/200-add-ralink-eth.patch b/target/linux/ramips/patches-5.4/200-add-ralink-eth.patch
index b8fd8e511d..79e7c2309b 100644
--- a/target/linux/ramips/patches-5.4/200-add-ralink-eth.patch
+++ b/target/linux/ramips/patches-5.4/200-add-ralink-eth.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
-@@ -159,6 +159,7 @@ source "drivers/net/ethernet/pasemi/Kcon
+@@ -160,6 +160,7 @@ source "drivers/net/ethernet/pasemi/Kcon
source "drivers/net/ethernet/pensando/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/qualcomm/Kconfig"
diff --git a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
index c19cfd322d..b53108ec3c 100644
--- a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
+++ b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -547,7 +547,10 @@ static int phy_check_link_status(struct
+@@ -549,7 +549,10 @@ static int phy_check_link_status(struct
phy_link_up(phydev);
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
phydev->state = PHY_NOLINK;
@@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
}
return 0;
-@@ -927,7 +930,10 @@ void phy_state_machine(struct work_struc
+@@ -947,7 +950,10 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;