diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-10-27 20:52:53 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-11-02 21:09:44 +0100 |
| commit | f3a78afe7f32d32c0d6a913452ddc0a24fa7d246 (patch) | |
| tree | 8e50e7ecc9e3511cdbac5ca4ac1f427aa59bcdb0 /target/linux/ath79/patches-5.10 | |
| parent | de2162d27d811b84fcde022a556c9e31a6d77156 (diff) | |
| download | upstream-f3a78afe7f32d32c0d6a913452ddc0a24fa7d246.tar.gz upstream-f3a78afe7f32d32c0d6a913452ddc0a24fa7d246.tar.bz2 upstream-f3a78afe7f32d32c0d6a913452ddc0a24fa7d246.zip | |
kernel: bump 5.10 to 5.10.198
All patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ath79/patches-5.10')
| -rw-r--r-- | target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch index 96e8a71232..64922763f1 100644 --- a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch @@ -305,7 +305,7 @@ list_for_each_entry(p, head, list) { --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -609,48 +609,53 @@ static void tcp_options_write(__be32 *pt +@@ -608,48 +608,53 @@ static void tcp_options_write(__be32 *pt u16 options = opts->options; /* mungable copy */ if (unlikely(OPTION_MD5 & options)) { @@ -382,7 +382,7 @@ } if (unlikely(opts->num_sack_blocks)) { -@@ -658,16 +663,17 @@ static void tcp_options_write(__be32 *pt +@@ -657,16 +662,17 @@ static void tcp_options_write(__be32 *pt tp->duplicate_sack : tp->selective_acks; int this_sack; @@ -406,7 +406,7 @@ } tp->rx_opt.dsack = 0; -@@ -680,13 +686,14 @@ static void tcp_options_write(__be32 *pt +@@ -679,13 +685,14 @@ static void tcp_options_write(__be32 *pt if (foc->exp) { len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len; @@ -706,7 +706,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4133,14 +4133,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -4146,14 +4146,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); |