aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-04 15:16:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-04 21:12:42 +0200
commit68d9cb82143b864d70e4fb3d7cbb7068f82216a1 (patch)
tree937de971cb0239c77a2e533022aba3fd4a8f36ba /target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch
parent6062d858929df927e244280ec4864b35a217d6d1 (diff)
downloadupstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.tar.gz
upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.tar.bz2
upstream-68d9cb82143b864d70e4fb3d7cbb7068f82216a1.zip
kernel: Update kernel 5.4 to version 5.4.50
Run tested: ath79, ipq40xx Build tested: ath79, ipq40xx Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch')
-rw-r--r--target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch b/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch
index 855c4d2aac..f03cd2a984 100644
--- a/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch
+++ b/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch
@@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -1679,6 +1679,40 @@ static int genphy_config_advert(struct p
+@@ -1681,6 +1681,40 @@ static int genphy_config_advert(struct p
}
/**
@@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* genphy_config_eee_advert - disable unwanted eee mode advertisement
* @phydev: target phy_device struct
*
-@@ -1787,6 +1821,54 @@ int __genphy_config_aneg(struct phy_devi
+@@ -1789,6 +1823,54 @@ int __genphy_config_aneg(struct phy_devi
EXPORT_SYMBOL(__genphy_config_aneg);
/**
@@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* genphy_aneg_done - return auto-negotiation status
* @phydev: target phy_device struct
*
-@@ -1958,6 +2040,63 @@ int genphy_read_status(struct phy_device
+@@ -1960,6 +2042,63 @@ int genphy_read_status(struct phy_device
EXPORT_SYMBOL(genphy_read_status);
/**