diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2023-08-26 02:19:18 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2023-08-28 16:35:22 +0100 |
| commit | f631c7bbb16f1d39d59c4cdf3f7189abab4fd9c6 (patch) | |
| tree | 49bc83ed6ac8c835fe18f201654236c7bca0aa70 /target/linux/generic/hack-5.15 | |
| parent | a0f4eadf6a25fb54c189bde91425673e11125d35 (diff) | |
| download | upstream-f631c7bbb16f1d39d59c4cdf3f7189abab4fd9c6.tar.gz upstream-f631c7bbb16f1d39d59c4cdf3f7189abab4fd9c6.tar.bz2 upstream-f631c7bbb16f1d39d59c4cdf3f7189abab4fd9c6.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>
Diffstat (limited to 'target/linux/generic/hack-5.15')
| -rw-r--r-- | target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch b/target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch index b1e7065a8b9..33c5c271212 100644 --- a/target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch +++ b/target/linux/generic/hack-5.15/795-backport-phylink_pcs-helpers.patch @@ -17,7 +17,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/include/linux/phylink.h +++ b/include/linux/phylink.h -@@ -584,10 +584,37 @@ int phylink_speed_up(struct phylink *pl) +@@ -600,10 +600,37 @@ int phylink_speed_up(struct phylink *pl) #define phylink_test(bm, mode) __phylink_do_bit(test_bit, bm, mode) void phylink_set_port_modes(unsigned long *bits); @@ -57,7 +57,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> const unsigned long *advertising); --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -885,7 +885,6 @@ static int phylink_change_inband_advert( +@@ -931,7 +931,6 @@ static int phylink_change_inband_advert( return 0; } @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> static void phylink_mac_pcs_get_state(struct phylink *pl, struct phylink_link_state *state) { -@@ -2966,6 +2965,52 @@ void phylink_mii_c22_pcs_get_state(struc +@@ -3014,6 +3013,52 @@ void phylink_mii_c22_pcs_get_state(struc EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state); /** @@ -118,7 +118,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> * phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS * advertisement * @pcs: a pointer to a &struct mdio_device. -@@ -3037,6 +3082,46 @@ int phylink_mii_c22_pcs_set_advertisemen +@@ -3085,6 +3130,46 @@ int phylink_mii_c22_pcs_set_advertisemen EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_set_advertisement); /** |