Changeset 37223


Ignore:
Timestamp:
2013-07-10T13:33:43+02:00 (5 years ago)
Author:
nbd
Message:

ar71xx: make implicit alignment in struct pptp_addr explicit to fix ABI breakage caused by the unaligned access hacks patch

Signed-off-by: Felix Fietkau <nbd@…>

Location:
trunk/target/linux/ar71xx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch

    r37214 r37223  
    903903        } 
    904904        return false; 
     905--- a/include/uapi/linux/if_pppox.h 
     906+++ b/include/uapi/linux/if_pppox.h 
     907@@ -47,6 +47,7 @@ struct pppoe_addr { 
     908  */ 
     909 struct pptp_addr { 
     910        __be16          call_id; 
     911+       __u16           pad; 
     912        struct in_addr  sin_addr; 
     913 }; 
     914  
  • trunk/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch

    r37176 r37223  
    280280  
    281281 #include <linux/proc_fs.h> 
    282 @@ -764,10 +765,10 @@ static void tcp_v6_send_response(struct 
     282@@ -764,10 +765,10 @@ static void tcp_v6_send_response(struct  
    283283        topt = (__be32 *)(t1 + 1); 
    284284  
     
    416416                fl6.flowi6_mark = skb->mark; 
    417417  
    418 @@ -1240,7 +1240,7 @@ static int ip6gre_header(struct sk_buff 
     418@@ -1240,7 +1240,7 @@ static int ip6gre_header(struct sk_buff  
    419419        struct ipv6hdr *ipv6h = (struct ipv6hdr *)skb_push(skb, t->hlen); 
    420420        __be16 *p = (__be16 *)(ipv6h+1); 
     
    832832--- a/include/net/inet_ecn.h 
    833833+++ b/include/net/inet_ecn.h 
    834 @@ -115,13 +115,13 @@ static inline int IP6_ECN_set_ce(struct 
     834@@ -115,13 +115,13 @@ static inline int IP6_ECN_set_ce(struct  
    835835 { 
    836836        if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph))) 
     
    995995--- a/net/xfrm/xfrm_input.c 
    996996+++ b/net/xfrm/xfrm_input.c 
    997 @@ -77,8 +77,8 @@ int xfrm_parse_spi(struct sk_buff *skb, 
     997@@ -77,8 +77,8 @@ int xfrm_parse_spi(struct sk_buff *skb,  
    998998        if (!pskb_may_pull(skb, hlen)) 
    999999                return -EINVAL; 
     
    10061006 } 
    10071007  
     1008--- a/include/uapi/linux/if_pppox.h 
     1009+++ b/include/uapi/linux/if_pppox.h 
     1010@@ -47,6 +47,7 @@ struct pppoe_addr { 
     1011  */ 
     1012 struct pptp_addr { 
     1013        __be16          call_id; 
     1014+       __u16           pad; 
     1015        struct in_addr  sin_addr; 
     1016 }; 
     1017  
Note: See TracChangeset for help on using the changeset viewer.