kernel: bump 4.19 to 4.19.115

[openwrt/openwrt.git] / target / linux / ath79 / patches-4.19 / 910-unaligned_access_hacks.patch

diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch
index ad7b12d650cc31d94cdf5da032c67023ee904e05..0efb33676a4934d00d3b0fbda1db8ab44761809e 100644 (file)
--- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch
@@ -316,7 +316,7 @@
        list_for_each_entry(p, head, list) {
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
-@@ -448,7 +448,7 @@ static struct neighbour *ipv4_neigh_look
+@@ -449,7 +449,7 @@ static struct neighbour *ipv4_neigh_look
        else if (skb)
                pkey = &ip_hdr(skb)->daddr;
  
@@ -327,7 +327,7 @@
        return neigh_create(&arp_tbl, pkey, dev);
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -444,48 +444,53 @@ static void tcp_options_write(__be32 *pt
+@@ -447,48 +447,53 @@ static void tcp_options_write(__be32 *pt
        u16 options = opts->options;    /* mungable copy */
  
        if (unlikely(OPTION_MD5 & options)) {
@@ -404,7 +404,7 @@
        }
  
        if (unlikely(opts->num_sack_blocks)) {
-@@ -493,16 +498,17 @@ static void tcp_options_write(__be32 *pt
+@@ -496,16 +501,17 @@ static void tcp_options_write(__be32 *pt
                        tp->duplicate_sack : tp->selective_acks;
                int this_sack;
  
@@ -428,7 +428,7 @@
                }
  
                tp->rx_opt.dsack = 0;
-@@ -515,13 +521,14 @@ static void tcp_options_write(__be32 *pt
+@@ -518,13 +524,14 @@ static void tcp_options_write(__be32 *pt
  
                if (foc->exp) {
                        len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
@@ -728,7 +728,7 @@
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3891,14 +3891,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3896,14 +3896,16 @@ static bool tcp_parse_aligned_timestamp(
  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  
@@ -802,7 +802,7 @@
   * No flags defined yet.
 --- a/net/core/utils.c
 +++ b/net/core/utils.c
-@@ -447,8 +447,14 @@ void inet_proto_csum_replace16(__sum16 *
+@@ -464,8 +464,14 @@ void inet_proto_csum_replace16(__sum16 *
                               bool pseudohdr)
  {
        __be32 diff[] = {