kernel: update 4.4 to 4.4.83

[openwrt/staging/chunkeey.git] / target / linux / generic / pending-4.4 / 704-phy-no-genphy-soft-reset.patch

diff --git a/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch
index d876187d7c34dd76d97f70b86b5ba5e04683aa56..7cec6d3226710408695aa5f832e100f53ac3fd5d 100644 (file)
--- a/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch
+++ b/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch
@@ -1,29 +1,11 @@
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1213,7 +1213,7 @@ int genphy_config_init(struct phy_device
-       return 0;
- }
- 
--static int gen10g_soft_reset(struct phy_device *phydev)
-+static int no_soft_reset(struct phy_device *phydev)
- {
-       /* Do nothing for now */
-       return 0;
-@@ -1448,7 +1448,7 @@ static struct phy_driver genphy_driver[]
-       .phy_id         = 0xffffffff,
-       .phy_id_mask    = 0xffffffff,
-       .name           = "Generic PHY",
--      .soft_reset     = genphy_soft_reset,
-+      .soft_reset     = no_soft_reset,
-       .config_init    = genphy_config_init,
-       .features       = PHY_GBIT_FEATURES | SUPPORTED_MII |
-                         SUPPORTED_AUI | SUPPORTED_FIBRE |
-@@ -1463,7 +1463,7 @@ static struct phy_driver genphy_driver[]
+@@ -1465,7 +1465,7 @@ static struct phy_driver genphy_driver[]
        .phy_id         = 0xffffffff,
        .phy_id_mask    = 0xffffffff,
        .name           = "Generic 10G PHY",
 -      .soft_reset     = gen10g_soft_reset,
-+      .soft_reset     = no_soft_reset,
++      .soft_reset     = genphy_no_soft_reset,
        .config_init    = gen10g_config_init,
        .features       = 0,
        .config_aneg    = gen10g_config_aneg,