|
@@ -1,3 +1,47 @@
|
|
|
+From: Felix Fietkau <[email protected]>
|
|
|
+Subject: [PATCH] ar71xx: fix unaligned access in a few more places
|
|
|
+
|
|
|
+SVN-Revision: 35130
|
|
|
+---
|
|
|
+ arch/mips/include/asm/checksum.h | 83 +++---------------
|
|
|
+ include/uapi/linux/ip.h | 2 +-
|
|
|
+ include/uapi/linux/ipv6.h | 2 +-
|
|
|
+ include/uapi/linux/tcp.h | 4 ++--
|
|
|
+ include/uapi/linux/udp.h | 2 +-
|
|
|
+ net/netfilter/nf_conntrack_core.c | 4 ++--
|
|
|
+ include/uapi/linux/icmp.h | 2 +-
|
|
|
+ include/uapi/linux/in6.h | 2 +-
|
|
|
+ net/ipv6/tcp_ipv6.c | 9 +++--
|
|
|
+ net/ipv6/datagram.c | 6 ++--
|
|
|
+ net/ipv6/exthdrs.c | 2 +-
|
|
|
+ include/linux/types.h | 5 +++
|
|
|
+ net/ipv4/af_inet.c | 4 ++--
|
|
|
+ net/ipv4/tcp_output.c | 69 +++++++++--------
|
|
|
+ include/uapi/linux/igmp.h | 8 +++---
|
|
|
+ net/core/flow_dissector.c | 2 +-
|
|
|
+ include/uapi/linux/icmpv6.h | 2 +-
|
|
|
+ include/net/ndisc.h | 10 ++++----
|
|
|
+ net/sched/cls_u32.c | 6 +++---
|
|
|
+ net/ipv6/ip6_offload.c | 2 +-
|
|
|
+ include/net/addrconf.h | 2 +-
|
|
|
+ include/net/inet_ecn.h | 4 ++--
|
|
|
+ include/net/ipv6.h | 23 +++++----
|
|
|
+ include/net/secure_seq.h | 1 +
|
|
|
+ include/uapi/linux/in.h | 2 +-
|
|
|
+ net/ipv6/ip6_fib.h | 2 +-
|
|
|
+ net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
|
|
|
+ net/xfrm/xfrm_input.c | 4 ++--
|
|
|
+ net/ipv4/tcp_input.c | 12 ++++---
|
|
|
+ include/uapi/linux/if_pppox.h | 1 +
|
|
|
+ net/ipv6/netfilter/nf_log_ipv6.c | 4 ++--
|
|
|
+ include/net/neighbour.h | 6 +++--
|
|
|
+ include/uapi/linux/netfilter_arp/arp_tables.h | 2 +-
|
|
|
+ net/core/utils.c | 10 +++++--
|
|
|
+ include/linux/etherdevice.h | 11 ++++---
|
|
|
+ net/ipv4/tcp_offload.c | 6 +++---
|
|
|
+ net/ipv6/netfilter/ip6table_mangle.c | 4 ++--
|
|
|
+ 37 file changed, 171 insertions(+), 141 deletions(-)
|
|
|
+
|
|
|
--- a/arch/mips/include/asm/checksum.h
|
|
|
+++ b/arch/mips/include/asm/checksum.h
|
|
|
@@ -100,26 +100,30 @@ static inline __sum16 ip_fast_csum(const
|
|
@@ -229,16 +273,6 @@
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_TCP_MD5SIG
|
|
|
---- a/include/linux/ipv6.h
|
|
|
-+++ b/include/linux/ipv6.h
|
|
|
-@@ -6,6 +6,7 @@
|
|
|
-
|
|
|
- #define ipv6_optlen(p) (((p)->hdrlen+1) << 3)
|
|
|
- #define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
|
|
|
-+
|
|
|
- /*
|
|
|
- * This structure contains configuration options per IPv6 link.
|
|
|
- */
|
|
|
--- a/net/ipv6/datagram.c
|
|
|
+++ b/net/ipv6/datagram.c
|
|
|
@@ -492,7 +492,7 @@ int ipv6_recv_error(struct sock *sk, str
|