diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-07-07 17:41:40 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-11 00:50:18 +0200 |
| commit | 3e9ad2cdce569e7272d2f34ea5feaef7cd531219 (patch) | |
| tree | 8d8a595232b65733e2191c4deed9b072ebfdff69 /target/linux/ramips/patches-5.15 | |
| parent | 2fc6d9912a3ee4adfb86443d9dcbcc8ff23c2a23 (diff) | |
| download | upstream-3e9ad2cdce569e7272d2f34ea5feaef7cd531219.tar.gz upstream-3e9ad2cdce569e7272d2f34ea5feaef7cd531219.tar.bz2 upstream-3e9ad2cdce569e7272d2f34ea5feaef7cd531219.zip | |
kernel: bump 5.15 to 5.15.53
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/ramips/patches-5.15')
| -rw-r--r-- | target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch | 14 | ||||
| -rw-r--r-- | target/linux/ramips/patches-5.15/721-NET-no-auto-carrier-off-support.patch | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch b/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch index 131371b794..6db8296743 100644 --- a/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch +++ b/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch @@ -16,7 +16,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -58,13 +58,13 @@ static const char *phy_state_to_str(enum +@@ -59,13 +59,13 @@ static const char *phy_state_to_str(enum static void phy_link_up(struct phy_device *phydev) { @@ -33,7 +33,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c phy_led_trigger_change_speed(phydev); } -@@ -550,7 +550,7 @@ int phy_start_cable_test(struct phy_devi +@@ -551,7 +551,7 @@ int phy_start_cable_test(struct phy_devi goto out; /* Mark the carrier down until the test is complete */ @@ -42,7 +42,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c netif_testing_on(dev); err = phydev->drv->cable_test_start(phydev); -@@ -621,7 +621,7 @@ int phy_start_cable_test_tdr(struct phy_ +@@ -622,7 +622,7 @@ int phy_start_cable_test_tdr(struct phy_ goto out; /* Mark the carrier down until the test is complete */ @@ -51,7 +51,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c netif_testing_on(dev); err = phydev->drv->cable_test_tdr_start(phydev, config); -@@ -693,7 +693,7 @@ static int phy_check_link_status(struct +@@ -694,7 +694,7 @@ static int phy_check_link_status(struct phy_link_up(phydev); } else if (!phydev->link && phydev->state != PHY_NOLINK) { phydev->state = PHY_NOLINK; @@ -60,7 +60,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c } return 0; -@@ -1154,7 +1154,7 @@ void phy_state_machine(struct work_struc +@@ -1177,7 +1177,7 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; @@ -71,7 +71,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c break; --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1000,14 +1000,16 @@ struct phy_device *phy_find_first(struct +@@ -1023,14 +1023,16 @@ struct phy_device *phy_find_first(struct } EXPORT_SYMBOL(phy_find_first); @@ -107,7 +107,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c bool tx_pause, rx_pause; --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -663,7 +663,7 @@ struct phy_device { +@@ -669,7 +669,7 @@ struct phy_device { u8 mdix; u8 mdix_ctrl; diff --git a/target/linux/ramips/patches-5.15/721-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-5.15/721-NET-no-auto-carrier-off-support.patch index cbd94e3e92..97086fa950 100644 --- a/target/linux/ramips/patches-5.15/721-NET-no-auto-carrier-off-support.patch +++ b/target/linux/ramips/patches-5.15/721-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 -@@ -693,7 +693,10 @@ static int phy_check_link_status(struct +@@ -694,7 +694,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; -@@ -1154,7 +1157,10 @@ void phy_state_machine(struct work_struc +@@ -1177,7 +1180,10 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; @@ -37,7 +37,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> break; --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -582,6 +582,7 @@ struct phy_device { +@@ -586,6 +586,7 @@ struct phy_device { unsigned downshifted_rate:1; unsigned is_on_sfp_module:1; unsigned mac_managed_pm:1; |