aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-07-29 17:54:16 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-07-31 16:51:46 +0200
commitc7634180fc8104e2f770f2efbe77b5235514fd75 (patch)
tree28a18c68ae756496f132658b94d9445393738e4d /target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch
parent1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a (diff)
downloadupstream-c7634180fc8104e2f770f2efbe77b5235514fd75.tar.gz
upstream-c7634180fc8104e2f770f2efbe77b5235514fd75.tar.bz2
upstream-c7634180fc8104e2f770f2efbe77b5235514fd75.zip
kernel: bump 4.19 to 4.19.62
Refreshed all patches. Remove upstreamed: - 023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch - 023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch - 023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch - 950-0252-staging-bcm2835_camera-Ensure-all-buffers-are-return.patch - 950-0253-staging-bcm2835-camera-Remove-check-of-the-number-of.patch - 950-0254-staging-bcm2835-camera-Handle-empty-EOS-buffers-whil.patch - 950-0489-staging-mmal-vchiq-Replace-spinlock-protecting-conte.patch - 0021-ARM-dts-gemini-Fix-up-DNS-313-compatible-string.patch - 049-v4.20-mips-remove-superfluous-check-for-linux.patch - 100-MIPS-fix-build-on-non-linux-hosts.patch - 303-MIPS-Fix-bounds-check-virt_addr_valid.patch - 0002-usb-dwc2-use-a-longer-AHB-idle-timeout-in-dwc2_core_.patch Altered patches: - 950-0267-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch - 700-net-add-qualcomm-mdio-and-phy.patch Fixes: - CVE-2019-3846 New symbol: - AX88796B_PHY Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch')
-rw-r--r--target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch b/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch
index b78c6d8e3c..854ac68769 100644
--- a/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch
+++ b/target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch
@@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -1131,6 +1131,184 @@ static void sfp_hwmon_remove(struct sfp
+@@ -1132,6 +1132,184 @@ static void sfp_hwmon_remove(struct sfp
}
#endif
@@ -195,7 +195,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
/* Helpers */
static void sfp_module_tx_disable(struct sfp *sfp)
{
-@@ -1375,6 +1553,8 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -1376,6 +1554,8 @@ static int sfp_sm_mod_probe(struct sfp *
{
/* SFP module inserted - read I2C data */
struct sfp_eeprom_id id;
@@ -204,7 +204,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
bool cotsworks;
u8 check;
int ret;
-@@ -1431,12 +1611,87 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -1432,12 +1612,87 @@ static int sfp_sm_mod_probe(struct sfp *
sfp->id = id;