diff options
| author | John Audia <therealgraysky@proton.me> | 2023-04-20 08:53:12 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-22 01:10:24 +0200 |
| commit | 3887a55909aa26c3366fd0206772280da850ab16 (patch) | |
| tree | debbd1c9b68ffd77c114398b756f19a66255fad2 /target/linux/generic/backport-5.15/783-v6.1-net-sfp-re-implement-soft-state-polling-setup.patch | |
| parent | 28ce677fa7402a2d59033012a76cbfa1b4b9b868 (diff) | |
| download | upstream-3887a55909aa26c3366fd0206772280da850ab16.tar.gz upstream-3887a55909aa26c3366fd0206772280da850ab16.tar.bz2 upstream-3887a55909aa26c3366fd0206772280da850ab16.zip | |
kernel: bump 5.15 to 5.15.108
Removed upstreamed:
backport-5.15/430-v6.3-ubi-Fix-failure-attaching-when-vid_hdr-offset-equals.patch[1]
backport-5.15/612-v6.3-skbuff-Fix-a-race-between-coalescing-and-releasing-S.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.108&id=85d7a7044b759d865d10395a357632af00de5867
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.108&id=906a6689bb0191ad2a44131a3377006aa098af59
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/783-v6.1-net-sfp-re-implement-soft-state-polling-setup.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/783-v6.1-net-sfp-re-implement-soft-state-polling-setup.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 6f69b7ddfe..77cd336d36 100644 --- 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]); } |