treewide: refresh patches
authorRobert Marko <robimarko@gmail.com>
Sat, 22 Jun 2024 10:41:28 +0000 (12:41 +0200)
committerRobert Marko <robimarko@gmail.com>
Mon, 24 Jun 2024 07:46:19 +0000 (09:46 +0200)
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>
target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch
target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch
target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch
target/linux/ramips/patches-6.6/720-NET-no-auto-carrier-off-support.patch

index 8beee8f2dc1af75950b356319bf130ea04141338..c125d293d755136302e64c0a2f32a032061c2848 100644 (file)
@@ -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:
index 1a1d7a0ac789de76f7dceec835ee7198224194de..ed7b2c260996f3e932deb9bfabf437f111efa654 100644 (file)
@@ -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:
index abb0a1e5ed9c96a9ff34ab8470be4bd14bb6383b..b4e527214e85d9a8e968192212307d6d6b3224d1 100644 (file)
@@ -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:
index df47096818ddeeae3e45569071d9b3e01bf9b08b..58e7ff37253e4a0ef2b9d28a5a9d2f0f7563909d 100644 (file)
@@ -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;