diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:51:34 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:51:34 +0000 |
| commit | 418c28764024a6ecf6bbd66315de6df006ac037a (patch) | |
| tree | 690c030be8e2625c2409b5515a09d85d276d17f9 /target/linux/ar71xx/patches-4.1 | |
| parent | c7377ba3fe9346b407140d0f5e7f33158cbcd301 (diff) | |
| download | master-187ad058-418c28764024a6ecf6bbd66315de6df006ac037a.tar.gz master-187ad058-418c28764024a6ecf6bbd66315de6df006ac037a.tar.bz2 master-187ad058-418c28764024a6ecf6bbd66315de6df006ac037a.zip | |
kernel/4.1: update to version 4.1.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48223 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-4.1')
| -rw-r--r-- | target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch index bd41bdf479..7fee654f03 100644 --- a/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch @@ -214,7 +214,7 @@ #include <linux/uaccess.h> #include <linux/ipv6.h> #include <linux/icmpv6.h> -@@ -772,10 +773,10 @@ static void tcp_v6_send_response(struct +@@ -775,10 +776,10 @@ static void tcp_v6_send_response(struct topt = (__be32 *)(t1 + 1); if (tsecr) { @@ -241,7 +241,7 @@ */ --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c -@@ -424,7 +424,7 @@ int ipv6_recv_error(struct sock *sk, str +@@ -426,7 +426,7 @@ int ipv6_recv_error(struct sock *sk, str ipv6_iface_scope_id(&sin->sin6_addr, IP6CB(skb)->iif); } else { @@ -250,7 +250,7 @@ &sin->sin6_addr); sin->sin6_scope_id = 0; } -@@ -761,12 +761,12 @@ int ip6_datagram_send_ctl(struct net *ne +@@ -763,12 +763,12 @@ int ip6_datagram_send_ctl(struct net *ne } if (fl6->flowlabel&IPV6_FLOWINFO_MASK) { @@ -659,7 +659,7 @@ #define IP6_MF 0x0001 #define IP6_OFFSET 0xFFF8 -@@ -396,8 +396,8 @@ static inline void __ipv6_addr_set_half( +@@ -415,8 +415,8 @@ static inline void __ipv6_addr_set_half( } #endif #endif @@ -670,7 +670,7 @@ } static inline void ipv6_addr_set(struct in6_addr *addr, -@@ -456,6 +456,8 @@ static inline bool ipv6_prefix_equal(con +@@ -475,6 +475,8 @@ static inline bool ipv6_prefix_equal(con const __be32 *a1 = addr1->s6_addr32; const __be32 *a2 = addr2->s6_addr32; unsigned int pdw, pbi; @@ -679,7 +679,7 @@ /* check complete u32 in prefix */ pdw = prefixlen >> 5; -@@ -464,7 +466,9 @@ static inline bool ipv6_prefix_equal(con +@@ -483,7 +485,9 @@ static inline bool ipv6_prefix_equal(con /* check incomplete u32 in prefix */ pbi = prefixlen & 0x1f; @@ -690,7 +690,7 @@ return false; return true; -@@ -607,13 +611,13 @@ static inline void ipv6_addr_set_v4mappe +@@ -627,13 +631,13 @@ static inline void ipv6_addr_set_v4mappe */ static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen) { @@ -706,7 +706,7 @@ if (xb) return i * 32 + 31 - __fls(ntohl(xb)); } -@@ -739,17 +743,18 @@ static inline __be32 ip6_make_flowlabel( +@@ -759,17 +763,18 @@ static inline __be32 ip6_make_flowlabel( static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass, __be32 flowlabel) { |