diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-11 15:49:53 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-12 16:04:25 +0200 |
commit | f63a1caf22cb67f986e37a6ff3def1502b1824e9 (patch) | |
tree | 3bb92a531c1156eae8043b50439c68209c8ce568 /target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch | |
parent | 40b1e899ba120fcd1a8734d33e980669fd1cc67f (diff) | |
download | upstream-f63a1caf22cb67f986e37a6ff3def1502b1824e9.tar.gz upstream-f63a1caf22cb67f986e37a6ff3def1502b1824e9.tar.bz2 upstream-f63a1caf22cb67f986e37a6ff3def1502b1824e9.zip |
kernel: bump 4.14 to 4.14.125
Refreshed all patches.
Altered patches:
- 403-net-mvneta-convert-to-phylink.patch
- 410-sfp-hack-allow-marvell-10G-phy-support-to-use-SFP.patch
Compile-tested on: cns3xxx, imx6, mvebu
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch b/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch index eeb6b1ef19..ccc9896b50 100644 --- a/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch +++ b/target/linux/mvebu/patches-4.14/402-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 -@@ -248,6 +248,184 @@ static unsigned int sfp_check(void *buf, +@@ -264,6 +264,184 @@ static unsigned int sfp_check(void *buf, return check; } @@ -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) { -@@ -416,6 +594,7 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -432,6 +610,7 @@ static int sfp_sm_mod_probe(struct sfp * char sn[17]; char date[9]; char rev[5]; @@ -203,7 +203,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> u8 check; int err; -@@ -459,10 +638,83 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -475,10 +654,83 @@ static int sfp_sm_mod_probe(struct sfp * rev[4] = '\0'; memcpy(sn, sfp->id.ext.vendor_sn, 16); sn[16] = '\0'; |