kernel: bump 4.14 to 4.14.67

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

diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
index 0954c878948b1c6a3afdeef71df6efb6fb2a6999..41e58ce8c60cae6b2821e5507af1e2776fc80124 100644 (file)
--- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
@@ -610,7 +610,7 @@
  
  #define       IP6_MF          0x0001
  #define       IP6_OFFSET      0xFFF8
-@@ -451,8 +451,8 @@ static inline void __ipv6_addr_set_half(
+@@ -444,8 +444,8 @@ static inline void __ipv6_addr_set_half(
        }
  #endif
  #endif
@@ -621,7 +621,7 @@
  }
  
  static inline void ipv6_addr_set(struct in6_addr *addr, 
-@@ -511,6 +511,8 @@ static inline bool ipv6_prefix_equal(con
+@@ -504,6 +504,8 @@ static inline bool ipv6_prefix_equal(con
        const __be32 *a1 = addr1->s6_addr32;
        const __be32 *a2 = addr2->s6_addr32;
        unsigned int pdw, pbi;
@@ -630,7 +630,7 @@
  
        /* check complete u32 in prefix */
        pdw = prefixlen >> 5;
-@@ -519,7 +521,9 @@ static inline bool ipv6_prefix_equal(con
+@@ -512,7 +514,9 @@ static inline bool ipv6_prefix_equal(con
  
        /* check incomplete u32 in prefix */
        pbi = prefixlen & 0x1f;
@@ -641,7 +641,7 @@
                return false;
  
        return true;
-@@ -663,13 +667,13 @@ static inline void ipv6_addr_set_v4mappe
+@@ -656,13 +660,13 @@ static inline void ipv6_addr_set_v4mappe
   */
  static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
  {
@@ -657,7 +657,7 @@
                if (xb)
                        return i * 32 + 31 - __fls(ntohl(xb));
        }
-@@ -838,17 +842,18 @@ static inline int ip6_default_np_autolab
+@@ -831,17 +835,18 @@ static inline int ip6_default_np_autolab
  static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
                                __be32 flowlabel)
  {