Changeset 43586


Ignore:
Timestamp:
2014-12-09T10:38:33+01:00 (3 years ago)
Author:
nbd
Message:

ar71xx: remove another leftover broken chunk of code in the unaligned access hacks patch

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

File:
1 edited

Legend:

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

    r43560 r43586  
    201201  
    202202 #if __UAPI_DEF_SOCKADDR_IN6 
    203 --- a/net/ipv6/af_inet6.c 
    204 +++ b/net/ipv6/af_inet6.c 
    205 @@ -62,6 +62,7 @@ 
    206  #endif 
    207   
    208  #include <asm/uaccess.h> 
    209 +#include <asm/unaligned.h> 
    210  #include <linux/mroute6.h> 
    211   
    212  MODULE_AUTHOR("Cast of dozens"); 
    213 @@ -679,11 +680,12 @@ bool ipv6_opt_accepted(const struct sock 
    214  { 
    215         const struct ipv6_pinfo *np = inet6_sk(sk); 
    216         const struct inet6_skb_parm *opt = IP6CB(skb); 
    217 +       unsigned char *header = skb_network_header(skb); 
    218   
    219         if (np->rxopt.all) { 
    220                 if ((opt->hop && (np->rxopt.bits.hopopts || 
    221                                   np->rxopt.bits.ohopopts)) || 
    222 -                   (ip6_flowinfo((struct ipv6hdr *) skb_network_header(skb)) && 
    223 +                   (ip6_flowinfo((struct ipv6hdr *)net_hdr_word(header)) && 
    224                      np->rxopt.bits.rxflow) || 
    225                     (opt->srcrt && (np->rxopt.bits.srcrt || 
    226                      np->rxopt.bits.osrcrt)) || 
    227203--- a/net/ipv6/tcp_ipv6.c 
    228204+++ b/net/ipv6/tcp_ipv6.c 
Note: See TracChangeset for help on using the changeset viewer.