ar71xx: move the watchdog driver to the kernel

[openwrt/staging/chunkeey.git] / target / linux / ar71xx / patches-3.8 / 902-unaligned_access_hacks.patch

diff --git a/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch
index ae778dad282edd176ccea29ea1018c4c9e44e98a..714d2d63e2f632ab105dd9a1b3cb42a487981d64 100644 (file)
--- a/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch
@@ -191,7 +191,7 @@
  /*
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3868,13 +3868,14 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3896,13 +3896,14 @@ static bool tcp_parse_aligned_timestamp(
  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  
@@ -242,7 +242,7 @@
                     np->rxopt.bits.osrcrt)) ||
 --- a/net/ipv6/route.c
 +++ b/net/ipv6/route.c
-@@ -995,7 +995,7 @@ void ip6_route_input(struct sk_buff *skb
+@@ -1013,7 +1013,7 @@ void ip6_route_input(struct sk_buff *skb
                .flowi6_iif = skb->dev->ifindex,
                .daddr = iph->daddr,
                .saddr = iph->saddr,
@@ -251,7 +251,7 @@
                .flowi6_mark = skb->mark,
                .flowi6_proto = iph->nexthdr,
        };
-@@ -1159,7 +1159,7 @@ void ip6_update_pmtu(struct sk_buff *skb
+@@ -1177,7 +1177,7 @@ void ip6_update_pmtu(struct sk_buff *skb
        fl6.flowi6_flags = 0;
        fl6.daddr = iph->daddr;
        fl6.saddr = iph->saddr;
@@ -260,7 +260,7 @@
  
        dst = ip6_route_output(net, NULL, &fl6);
        if (!dst->error)
-@@ -1187,7 +1187,7 @@ void ip6_redirect(struct sk_buff *skb, s
+@@ -1205,7 +1205,7 @@ void ip6_redirect(struct sk_buff *skb, s
        fl6.flowi6_flags = 0;
        fl6.daddr = iph->daddr;
        fl6.saddr = iph->saddr;
@@ -279,7 +279,7 @@
  #include <asm/uaccess.h>
  
  #include <linux/proc_fs.h>
-@@ -763,10 +764,10 @@ static void tcp_v6_send_response(struct 
+@@ -764,10 +765,10 @@ static void tcp_v6_send_response(struct 
        topt = (__be32 *)(t1 + 1);
  
        if (ts) {
@@ -915,17 +915,6 @@
  
  #define IP_TOS                1
  #define IP_TTL                2
---- a/include/uapi/linux/xfrm.h
-+++ b/include/uapi/linux/xfrm.h
-@@ -13,7 +13,7 @@
- typedef union {
-       __be32          a4;
-       __be32          a6[4];
--} xfrm_address_t;
-+} __attribute__((packed, aligned(2))) xfrm_address_t;
- 
- /* Ident of a specific xfrm_state. It is used on input to lookup
-  * the state by (spi,daddr,ah/esp) or to store information about
 --- a/net/core/secure_seq.c
 +++ b/net/core/secure_seq.c
 @@ -43,10 +43,11 @@ __u32 secure_tcpv6_sequence_number(const
@@ -1016,3 +1005,13 @@
        return 0;
  }
  
+--- a/include/uapi/linux/if_pppox.h
++++ b/include/uapi/linux/if_pppox.h
+@@ -47,6 +47,7 @@ struct pppoe_addr {
+  */
+ struct pptp_addr {
+       __be16          call_id;
++      __u16           pad;
+       struct in_addr  sin_addr;
+ };
+