kernel: bump 5.15 to 5.15.108

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-5.15 / 783-v6.1-net-sfp-re-implement-soft-state-polling-setup.patch

diff --git a/target/linux/generic/backport-5.15/783-v6.1-net-sfp-re-implement-soft-state-polling-setup.patch b/target/linux/generic/backport-5.15/783-v6.1-net-sfp-re-implement-soft-state-polling-setup.patch
index 6f69b7ddfeb46b0151162df33ad5ea43258cb60d..77cd336d364c839af1ef898bad8c3890942be4aa 100644 (file)
--- a/target/linux/generic/backport-5.15/783-v6.1-net-sfp-re-implement-soft-state-polling-setup.patch
+++ b/target/linux/generic/backport-5.15/783-v6.1-net-sfp-re-implement-soft-state-polling-setup.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c
-@@ -234,6 +234,7 @@ struct sfp {
+@@ -240,6 +240,7 @@ struct sfp {
        bool need_poll;
  
        struct mutex st_mutex;                  /* Protects state */
@@ -28,7 +28,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        unsigned int state_soft_mask;
        unsigned int state;
        struct delayed_work poll;
-@@ -499,17 +500,18 @@ static void sfp_soft_set_state(struct sf
+@@ -505,17 +506,18 @@ static void sfp_soft_set_state(struct sf
  static void sfp_soft_start_poll(struct sfp *sfp)
  {
        const struct sfp_eeprom_id *id = &sfp->id;
@@ -56,7 +56,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        if (sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT) &&
            !sfp->need_poll)
-@@ -523,10 +525,11 @@ static void sfp_soft_stop_poll(struct sf
+@@ -529,10 +531,11 @@ static void sfp_soft_stop_poll(struct sf
  
  static unsigned int sfp_get_state(struct sfp *sfp)
  {
@@ -71,7 +71,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                state |= sfp_soft_get_state(sfp);
  
        return state;
-@@ -1940,6 +1943,15 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -1942,6 +1945,15 @@ static int sfp_sm_mod_probe(struct sfp *
        if (ret < 0)
                return ret;
  
@@ -87,7 +87,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        if (!memcmp(id.base.vendor_name, "ALCATELLUCENT   ", 16) &&
            !memcmp(id.base.vendor_pn, "3FE46541AA      ", 16))
                sfp->module_t_start_up = T_START_UP_BAD_GPON;
-@@ -2565,6 +2577,8 @@ static int sfp_probe(struct platform_dev
+@@ -2568,6 +2580,8 @@ static int sfp_probe(struct platform_dev
                                return PTR_ERR(sfp->gpio[i]);
                }