projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: Bump to 4.14.277
[librecmc/librecmc.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 e43bc97da346a19f999c70723538cd49ef392d6e..6bcf4af3b57b516c432206bb0e72926adb99ef00 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
@@
-214,7
+214,7
@@
#include <linux/uaccess.h>
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
#include <linux/uaccess.h>
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
-@@ -8
19,10 +820
,10 @@ static void tcp_v6_send_response(const s
+@@ -8
35,10 +836
,10 @@ static void tcp_v6_send_response(const s
topt = (__be32 *)(t1 + 1);
if (tsecr) {
topt = (__be32 *)(t1 + 1);
if (tsecr) {
@@
-231,7
+231,7
@@
#ifdef CONFIG_TCP_MD5SIG
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
#ifdef CONFIG_TCP_MD5SIG
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
-@@ -
6,6 +6
,7 @@
+@@ -
7,6 +7
,7 @@
#define ipv6_optlen(p) (((p)->hdrlen+1) << 3)
#define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
#define ipv6_optlen(p) (((p)->hdrlen+1) << 3)
#define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
@@
-267,7
+267,7
@@
case IPV6_2292HOPOPTS:
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
case IPV6_2292HOPOPTS:
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
-@@ -39
7,7 +397
,7 @@ static void ip6gre_err(struct sk_buff *s
+@@ -39
9,7 +399
,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);
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
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
-@@ -135
2,8 +1352
,8 @@ struct sk_buff **inet_gro_receive(struct
+@@ -135
5,8 +1355
,8 @@ struct sk_buff **inet_gro_receive(struct
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;
@@
-316,7
+316,7
@@
for (p = *head; p; p = p->next) {
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
for (p = *head; p; p = p->next) {
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
-@@ -46
5,7 +465
,7 @@ static struct neighbour *ipv4_neigh_look
+@@ -46
6,7 +466
,7 @@ static struct neighbour *ipv4_neigh_look
else if (skb)
pkey = &ip_hdr(skb)->daddr;
else if (skb)
pkey = &ip_hdr(skb)->daddr;
@@
-486,7
+486,7
@@
#define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
#define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
-@@ -10
8,7 +108
,7 @@ __be32 __skb_flow_get_ports(const struct
+@@ -10
9,7 +109
,7 @@ __be32 __skb_flow_get_ports(const struct
ports = __skb_header_pointer(skb, thoff + poff,
sizeof(_ports), data, hlen, &_ports);
if (ports)
ports = __skb_header_pointer(skb, thoff + poff,
sizeof(_ports), data, hlen, &_ports);
if (ports)
@@
-556,7
+556,7
@@
goto next_ht;
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
goto next_ht;
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
-@@ -22
1,7 +221
,7 @@ static struct sk_buff **ipv6_gro_receive
+@@ -22
3,7 +223
,7 @@ static struct sk_buff **ipv6_gro_receive
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
@@
-578,7
+578,7
@@
#include <net/if_inet6.h>
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
#include <net/if_inet6.h>
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
-@@ -12
5,9 +125
,9 @@ static inline int IP6_ECN_set_ce(struct
+@@ -12
6,9 +126
,9 @@ static inline int IP6_ECN_set_ce(struct
if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
return 0;
if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
return 0;
@@
-590,7
+590,7
@@
if (skb->ip_summed == CHECKSUM_COMPLETE)
skb->csum = csum_add(csum_sub(skb->csum, (__force __wsum)from),
(__force __wsum)to);
if (skb->ip_summed == CHECKSUM_COMPLETE)
skb->csum = csum_add(csum_sub(skb->csum, (__force __wsum)from),
(__force __wsum)to);
-@@ -13
6,7 +136
,7 @@ static inline int IP6_ECN_set_ce(struct
+@@ -13
7,7 +137
,7 @@ static inline int IP6_ECN_set_ce(struct
static inline void IP6_ECN_clear(struct ipv6hdr *iph)
{
static inline void IP6_ECN_clear(struct ipv6hdr *iph)
{
@@
-641,7
+641,7
@@
return false;
return true;
return false;
return true;
-@@ -6
34,13 +638
,13 @@ static inline void ipv6_addr_set_v4mappe
+@@ -6
05,13 +609
,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)
{
@@
-657,7
+657,7
@@
if (xb)
return i * 32 + 31 - __fls(ntohl(xb));
}
if (xb)
return i * 32 + 31 - __fls(ntohl(xb));
}
-@@ -
809,17 +813
,18 @@ static inline int ip6_default_np_autolab
+@@ -
780,17 +784
,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)
{
@@
-737,7
+737,7
@@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -38
58,14 +3858
,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -38
81,14 +3881
,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
{
const __be32 *ptr = (const __be32 *)(th + 1);
@@
-811,7
+811,7
@@
* No flags defined yet.
--- a/net/core/utils.c
+++ b/net/core/utils.c
* No flags defined yet.
--- a/net/core/utils.c
+++ b/net/core/utils.c
-@@ -4
24,8 +424
,14 @@ void inet_proto_csum_replace16(__sum16 *
+@@ -4
41,8 +441
,14 @@ void inet_proto_csum_replace16(__sum16 *
bool pseudohdr)
{
__be32 diff[] = {
bool pseudohdr)
{
__be32 diff[] = {
@@
-830,7
+830,7
@@
*sum = csum_fold(csum_partial(diff, sizeof(diff),
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
*sum = csum_fold(csum_partial(diff, sizeof(diff),
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
-@@ -4
80,7 +480
,7 @@ static inline bool is_etherdev_addr(cons
+@@ -4
79,7 +479
,7 @@ static inline bool is_etherdev_addr(cons
* @b: Pointer to Ethernet header
*
* Compare two Ethernet headers, returns 0 if equal.
* @b: Pointer to Ethernet header
*
* Compare two Ethernet headers, returns 0 if equal.
@@
-839,7
+839,7
@@
* aligned OR the platform can handle unaligned access. This is the
* case for all packets coming into netif_receive_skb or similar
* entry points.
* aligned OR the platform can handle unaligned access. This is the
* case for all packets coming into netif_receive_skb or similar
* entry points.
-@@ -50
3,11 +503
,12 @@ static inline unsigned long compare_ethe
+@@ -50
2,11 +502
,12 @@ static inline unsigned long compare_ethe
fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
return fold;
#else
fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
return fold;
#else
@@
-895,6
+895,6
@@
ipv6_hdr(skb)->hop_limit != hop_limit ||
- flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) {
+ flowlabel != net_hdr_word(ipv6_hdr(skb)))) {
ipv6_hdr(skb)->hop_limit != hop_limit ||
- flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) {
+ flowlabel != net_hdr_word(ipv6_hdr(skb)))) {
- err = ip6_route_me_harder(state->net, skb);
+ err = ip6_route_me_harder(state->net, s
tate->sk, s
kb);
if (err < 0)
ret = NF_DROP_ERR(err);
if (err < 0)
ret = NF_DROP_ERR(err);