ar71xx: switch to kernel 4.14

[openwrt/staging/jogo.git] / target / linux / ar71xx / patches-4.9 / 910-unaligned_access_hacks.patch

diff --git a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
index 464a930f3275c43da8ff252ed676eb6e17e7b201..049ee78d339b194eb8c0cb1e680a030eb448fa16 100644 (file)
--- a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
@@ -250,7 +250,7 @@
                                               &sin->sin6_addr);
                        sin->sin6_scope_id = 0;
                }
-@@ -814,12 +814,12 @@ int ip6_datagram_send_ctl(struct net *ne
+@@ -817,12 +817,12 @@ int ip6_datagram_send_ctl(struct net *ne
                        }
  
                        if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
@@ -267,7 +267,7 @@
                case IPV6_2292HOPOPTS:
 --- a/net/ipv6/ip6_gre.c
 +++ b/net/ipv6/ip6_gre.c
-@@ -395,7 +395,7 @@ static void ip6gre_err(struct sk_buff *s
+@@ -397,7 +397,7 @@ static void ip6gre_err(struct sk_buff *s
                return;
        ipv6h = (const struct ipv6hdr *)skb->data;
        greh = (const struct gre_base_hdr *)(skb->data + offset);
@@ -303,7 +303,7 @@
  #endif /* _LINUX_TYPES_H */
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
-@@ -1318,8 +1318,8 @@ struct sk_buff **inet_gro_receive(struct
+@@ -1319,8 +1319,8 @@ struct sk_buff **inet_gro_receive(struct
        if (unlikely(ip_fast_csum((u8 *)iph, 5)))
                goto out_unlock;
  
@@ -327,7 +327,7 @@
        return neigh_create(&arp_tbl, pkey, dev);
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -448,48 +448,53 @@ static void tcp_options_write(__be32 *pt
+@@ -453,48 +453,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)) {
-@@ -497,16 +502,17 @@ static void tcp_options_write(__be32 *pt
+@@ -502,16 +507,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;
-@@ -519,13 +525,14 @@ static void tcp_options_write(__be32 *pt
+@@ -524,13 +530,14 @@ static void tcp_options_write(__be32 *pt
  
                if (foc->exp) {
                        len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
@@ -567,7 +567,7 @@
                        goto next_ht;
 --- a/net/ipv6/ip6_offload.c
 +++ b/net/ipv6/ip6_offload.c
-@@ -220,7 +220,7 @@ static struct sk_buff **ipv6_gro_receive
+@@ -221,7 +221,7 @@ static struct sk_buff **ipv6_gro_receive
                        continue;
  
                iph2 = (struct ipv6hdr *)(p->data + off);
@@ -621,7 +621,7 @@
  
  #define       IP6_MF          0x0001
  #define       IP6_OFFSET      0xFFF8
-@@ -450,8 +450,8 @@ static inline void __ipv6_addr_set_half(
+@@ -443,8 +443,8 @@ static inline void __ipv6_addr_set_half(
        }
  #endif
  #endif
@@ -632,7 +632,7 @@
  }
  
  static inline void ipv6_addr_set(struct in6_addr *addr, 
-@@ -510,6 +510,8 @@ static inline bool ipv6_prefix_equal(con
+@@ -503,6 +503,8 @@ static inline bool ipv6_prefix_equal(con
        const __be32 *a1 = addr1->s6_addr32;
        const __be32 *a2 = addr2->s6_addr32;
        unsigned int pdw, pbi;
@@ -641,7 +641,7 @@
  
        /* check complete u32 in prefix */
        pdw = prefixlen >> 5;
-@@ -518,7 +520,9 @@ static inline bool ipv6_prefix_equal(con
+@@ -511,7 +513,9 @@ static inline bool ipv6_prefix_equal(con
  
        /* check incomplete u32 in prefix */
        pbi = prefixlen & 0x1f;
@@ -652,7 +652,7 @@
                return false;
  
        return true;
-@@ -662,13 +666,13 @@ static inline void ipv6_addr_set_v4mappe
+@@ -655,13 +659,13 @@ static inline void ipv6_addr_set_v4mappe
   */
  static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
  {
@@ -668,7 +668,7 @@
                if (xb)
                        return i * 32 + 31 - __fls(ntohl(xb));
        }
-@@ -837,17 +841,18 @@ static inline int ip6_default_np_autolab
+@@ -830,17 +834,18 @@ static inline int ip6_default_np_autolab
  static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
                                __be32 flowlabel)
  {
@@ -795,7 +795,7 @@
  
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3892,14 +3892,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3910,14 +3910,16 @@ static bool tcp_parse_aligned_timestamp(
  {
        const __be32 *ptr = (const __be32 *)(th + 1);