projects
/
openwrt
/
staging
/
hauke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.71
[openwrt/staging/hauke.git]
/
target
/
linux
/
ar71xx
/
patches-4.14
/
910-unaligned_access_hacks.patch
diff --git
a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
index a61d344114f5e5ae3c923ebbe06945cf63c8b583..015c283e1db0db8be49422aa301af659682d1be2 100644
(file)
--- a/
target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
+++ b/
target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
@@
-621,7
+621,7
@@
#define IP6_MF 0x0001
#define IP6_OFFSET 0xFFF8
#define IP6_MF 0x0001
#define IP6_OFFSET 0xFFF8
-@@ -4
44,8 +444
,8 @@ static inline void __ipv6_addr_set_half(
+@@ -4
37,8 +437
,8 @@ static inline void __ipv6_addr_set_half(
}
#endif
#endif
}
#endif
#endif
@@
-632,7
+632,7
@@
}
static inline void ipv6_addr_set(struct in6_addr *addr,
}
static inline void ipv6_addr_set(struct in6_addr *addr,
-@@ -
504,6 +504
,8 @@ static inline bool ipv6_prefix_equal(con
+@@ -
497,6 +497
,8 @@ static inline bool ipv6_prefix_equal(con
const __be32 *a1 = addr1->s6_addr32;
const __be32 *a2 = addr2->s6_addr32;
unsigned int pdw, pbi;
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;
/* check complete u32 in prefix */
pdw = prefixlen >> 5;
-@@ -5
12,7 +514
,9 @@ static inline bool ipv6_prefix_equal(con
+@@ -5
05,7 +507
,9 @@ static inline bool ipv6_prefix_equal(con
/* check incomplete u32 in prefix */
pbi = prefixlen & 0x1f;
/* check incomplete u32 in prefix */
pbi = prefixlen & 0x1f;
@@
-652,7
+652,7
@@
return false;
return true;
return false;
return true;
-@@ -6
56,13 +660
,13 @@ static inline void ipv6_addr_set_v4mappe
+@@ -6
34,13 +638
,13 @@ static inline void ipv6_addr_set_v4mappe
*/
static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
{
*/
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));
}
if (xb)
return i * 32 + 31 - __fls(ntohl(xb));
}
-@@ -8
31,17 +835
,18 @@ static inline int ip6_default_np_autolab
+@@ -8
09,17 +813
,18 @@ static inline int ip6_default_np_autolab
static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
__be32 flowlabel)
{
static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
__be32 flowlabel)
{