aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/711-v5.12-sfp-add-support-for-100-base-x-SFPs.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-04-13 16:25:50 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-17 21:47:11 +0200
commit143cbb22e12829edb2dca859e7329e6712ece567 (patch)
tree5632950d22682c2f877c37669ccd498767ee850c /target/linux/generic/backport-5.10/711-v5.12-sfp-add-support-for-100-base-x-SFPs.patch
parentd86980eab2acfc4e6e4d617de88e8b229f6d72ad (diff)
downloadupstream-143cbb22e12829edb2dca859e7329e6712ece567.tar.gz
upstream-143cbb22e12829edb2dca859e7329e6712ece567.tar.bz2
upstream-143cbb22e12829edb2dca859e7329e6712ece567.zip
kernel: bump 5.10 to 5.10.111
Removed upstreamed: pending-5.10/850-0003-PCI-aardvark-Fix-support-for-MSI-interrupts.patch apm821xx/patches-5.10/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us> (cherry picked from commit 0085dd6cb5e3c57dd22994c22ce893575711b6f7)
Diffstat (limited to 'target/linux/generic/backport-5.10/711-v5.12-sfp-add-support-for-100-base-x-SFPs.patch')
-rw-r--r--target/linux/generic/backport-5.10/711-v5.12-sfp-add-support-for-100-base-x-SFPs.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/711-v5.12-sfp-add-support-for-100-base-x-SFPs.patch b/target/linux/generic/backport-5.10/711-v5.12-sfp-add-support-for-100-base-x-SFPs.patch
index 7d06c235d9..0c87532e13 100644
--- a/target/linux/generic/backport-5.10/711-v5.12-sfp-add-support-for-100-base-x-SFPs.patch
+++ b/target/linux/generic/backport-5.10/711-v5.12-sfp-add-support-for-100-base-x-SFPs.patch
@@ -15,7 +15,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
-@@ -280,6 +280,12 @@ void sfp_parse_support(struct sfp_bus *b
+@@ -286,6 +286,12 @@ void sfp_parse_support(struct sfp_bus *b
br_min <= 1300 && br_max >= 1200)
phylink_set(modes, 1000baseX_Full);
@@ -28,7 +28,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/* For active or passive cables, select the link modes
* based on the bit rates and the cable compliance bytes.
*/
-@@ -399,6 +405,9 @@ phy_interface_t sfp_select_interface(str
+@@ -405,6 +411,9 @@ phy_interface_t sfp_select_interface(str
if (phylink_test(link_modes, 1000baseX_Full))
return PHY_INTERFACE_MODE_1000BASEX;