diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-10 18:34:09 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-18 00:11:17 +0200 |
| commit | 7ae0f74bcd0ccd762724022e63425dd41bb2cde8 (patch) | |
| tree | 679ed8414c308bdfdf73cd42e4fd6aa1586de958 /target/linux/ath79 | |
| parent | e0bdf839722659ded1ce2f827f04ec4d9be3c6fc (diff) | |
| download | upstream-7ae0f74bcd0ccd762724022e63425dd41bb2cde8.tar.gz upstream-7ae0f74bcd0ccd762724022e63425dd41bb2cde8.tar.bz2 upstream-7ae0f74bcd0ccd762724022e63425dd41bb2cde8.zip | |
kernel: bump 5.4 to 5.4.192
Compile-tested: armvirt/64
Run-tested: armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ath79')
| -rw-r--r-- | target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch index 8680ececf2..d7279170f3 100644 --- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.4/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 -@@ -460,48 +460,53 @@ static void tcp_options_write(__be32 *pt +@@ -461,48 +461,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)) { -@@ -509,16 +514,17 @@ static void tcp_options_write(__be32 *pt +@@ -510,16 +515,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; -@@ -531,13 +537,14 @@ static void tcp_options_write(__be32 *pt +@@ -532,13 +538,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 -@@ -3976,14 +3976,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3977,14 +3977,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); |