kernel: 5.15: backport v6.1 PHY changes required for Aquantia

[openwrt/staging/jow.git] / target / linux / ramips / patches-5.15 / 720-Revert-net-phy-simplify-phy_link_change-arguments.patch

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 437c76113217650bf19fd176282088ae8d97362c..1262e9498d76581c9f7cf8156a98b18f9312df0f 100644 (file)
--- 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
@@ -33,7 +33,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
        phy_led_trigger_change_speed(phydev);
  }
  
-@@ -563,7 +563,7 @@ int phy_start_cable_test(struct phy_devi
+@@ -591,7 +591,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);
-@@ -634,7 +634,7 @@ int phy_start_cable_test_tdr(struct phy_
+@@ -662,7 +662,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);
-@@ -706,7 +706,7 @@ static int phy_check_link_status(struct
+@@ -734,7 +734,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;
-@@ -1192,7 +1192,7 @@ void phy_state_machine(struct work_struc
+@@ -1220,7 +1220,7 @@ void phy_state_machine(struct work_struc
        case PHY_HALTED:
                if (phydev->link) {
                        phydev->link = 0;
@@ -95,7 +95,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
                phydev->mii_ts->link_state(phydev->mii_ts, phydev);
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -1370,7 +1370,8 @@ void phylink_destroy(struct phylink *pl)
+@@ -1373,7 +1373,8 @@ void phylink_destroy(struct phylink *pl)
  }
  EXPORT_SYMBOL_GPL(phylink_destroy);
  
@@ -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
-@@ -706,7 +706,7 @@ struct phy_device {
+@@ -716,7 +716,7 @@ struct phy_device {
        u8 mdix;
        u8 mdix_ctrl;