aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2023-08-26 02:19:18 +0100
committerDaniel Golle <daniel@makrotopia.org>2023-09-04 23:00:34 +0100
commit625d19c1e2d0aebcd69b73062afc76ae9f4456b4 (patch)
treee53ea91535d69109871be407a7c505d9a8927862 /target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch
parent230c09d2034995540aaec920466eb25387173e56 (diff)
downloadupstream-625d19c1e2d0aebcd69b73062afc76ae9f4456b4.tar.gz
upstream-625d19c1e2d0aebcd69b73062afc76ae9f4456b4.tar.bz2
upstream-625d19c1e2d0aebcd69b73062afc76ae9f4456b4.zip
generic: sync MediaTek Ethernet driver with upstream
Import commits from upstream Linux replacing some downstream patches. Move accepted patches from pending-{5.15,6.1} to backport-{5.15,6.1}. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit f631c7bbb16f1d39d59c4cdf3f7189abab4fd9c6)
Diffstat (limited to 'target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch')
-rw-r--r--target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch b/target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch
index f9411e47d3..2048e22f2e 100644
--- a/target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch
+++ b/target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch
@@ -15,7 +15,7 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -403,6 +403,7 @@ void phylink_get_linkmodes(unsigned long
+@@ -408,6 +408,7 @@ void phylink_get_linkmodes(unsigned long
case PHY_INTERFACE_MODE_XGMII:
case PHY_INTERFACE_MODE_RXAUI:
@@ -23,7 +23,7 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>
case PHY_INTERFACE_MODE_XAUI:
case PHY_INTERFACE_MODE_10GBASER:
case PHY_INTERFACE_MODE_10GKR:
-@@ -657,6 +658,7 @@ static int phylink_parse_mode(struct phy
+@@ -662,6 +663,7 @@ static int phylink_parse_mode(struct phy
fallthrough;
case PHY_INTERFACE_MODE_USXGMII:
case PHY_INTERFACE_MODE_10GKR: