summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Marko <robimarko@gmail.com>2024-06-22 12:41:28 +0200
committerRobert Marko <robimarko@gmail.com>2024-06-24 09:46:19 +0200
commit215a3ca2a46f5373a284c4739650d77567d6ae20 (patch)
treee71b4fde2ca53d8f7b54b271084cce9abb1c9d79
parentf04e377a5003daa771414befdd9642e848cb42f9 (diff)
downloadopenwrt-215a3ca2a46f5373a284c4739650d77567d6ae20.tar.gz
openwrt-215a3ca2a46f5373a284c4739650d77567d6ae20.tar.bz2
openwrt-215a3ca2a46f5373a284c4739650d77567d6ae20.zip
treewide: refresh patches
These need to be refreshed, probably the generic backports affected them. Link: https://github.com/openwrt/openwrt/pull/15765 Signed-off-by: Robert Marko <robimarko@gmail.com>
-rw-r--r--target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch2
-rw-r--r--target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch2
-rw-r--r--target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch4
-rw-r--r--target/linux/ramips/patches-6.6/720-NET-no-auto-carrier-off-support.patch2
4 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch b/target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch
index 8beee8f2dc..c125d293d7 100644
--- a/target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch
+++ b/target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch
@@ -25,7 +25,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
case PHY_INTERFACE_MODE_QUSGMII:
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -218,6 +218,7 @@ static int phylink_interface_max_speed(p
+@@ -231,6 +231,7 @@ static int phylink_interface_max_speed(p
return SPEED_1000;
case PHY_INTERFACE_MODE_2500BASEX:
diff --git a/target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch b/target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch
index 1a1d7a0ac7..ed7b2c2609 100644
--- a/target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch
+++ b/target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch
@@ -32,7 +32,7 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -505,6 +505,7 @@ unsigned long phylink_get_capabilities(p
+@@ -518,6 +518,7 @@ unsigned long phylink_get_capabilities(p
break;
case PHY_INTERFACE_MODE_2500BASEX:
diff --git a/target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch b/target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch
index abb0a1e5ed..b4e527214e 100644
--- a/target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch
+++ b/target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch
@@ -25,7 +25,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
case PHY_INTERFACE_MODE_QUSGMII:
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -218,6 +218,7 @@ static int phylink_interface_max_speed(p
+@@ -231,6 +231,7 @@ static int phylink_interface_max_speed(p
return SPEED_1000;
case PHY_INTERFACE_MODE_2500BASEX:
@@ -33,7 +33,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
return SPEED_2500;
case PHY_INTERFACE_MODE_5GBASER:
-@@ -526,6 +527,7 @@ unsigned long phylink_get_capabilities(p
+@@ -539,6 +540,7 @@ unsigned long phylink_get_capabilities(p
break;
case PHY_INTERFACE_MODE_2500BASEX:
diff --git a/target/linux/ramips/patches-6.6/720-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-6.6/720-NET-no-auto-carrier-off-support.patch
index df47096818..58e7ff3725 100644
--- a/target/linux/ramips/patches-6.6/720-NET-no-auto-carrier-off-support.patch
+++ b/target/linux/ramips/patches-6.6/720-NET-no-auto-carrier-off-support.patch
@@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
if (phydev->mii_ts && phydev->mii_ts->link_state)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -659,6 +659,7 @@ struct phy_device {
+@@ -661,6 +661,7 @@ struct phy_device {
unsigned downshifted_rate:1;
unsigned is_on_sfp_module:1;
unsigned mac_managed_pm:1;