kernel: bump 4.14 to 4.14.104

[openwrt/staging/wigyori.git] / target / linux / mvebu / patches-4.14 / 402-sfp-display-SFP-module-information.patch

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 4f9e2e29b5fde0b4b0d380012b35f1992083c0cd..eeb6b1ef198f8f34ec31fa49067b3c6891619560 100644 (file)
--- 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
 
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c

-@@ -247,6 +247,184 @@ static unsigned int sfp_check(void *buf,
+@@ -248,6 +248,184 @@ static unsigned int sfp_check(void *buf,

        return check;
  }
  
        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)
  {
  /* Helpers */
  static void sfp_module_tx_disable(struct sfp *sfp)
  {

-@@ -415,6 +593,7 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -416,6 +594,7 @@ static int sfp_sm_mod_probe(struct sfp *

        char sn[17];
        char date[9];
        char rev[5];
        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;
  
        u8 check;
        int err;
  

-@@ -458,10 +637,83 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -459,10 +638,83 @@ static int sfp_sm_mod_probe(struct sfp *

        rev[4] = '\0';
        memcpy(sn, sfp->id.ext.vendor_sn, 16);
        sn[16] = '\0';
        rev[4] = '\0';
        memcpy(sn, sfp->id.ext.vendor_sn, 16);
        sn[16] = '\0';