source: trunk/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch @ 11539

Last change on this file since 11539 was 11539, checked in by agb, 8 years ago

[kernel] generic-2.6: Backport netfilter includes fix from 2.6.26 to 2.6.25

  • Fixes compilation of numerous packages
File size: 2.6 KB
  • include/linux/netfilter.h

    commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
    Author: Patrick McHardy <kaber@trash.net>
    Date:   Wed May 21 14:08:38 2008 -0700
    
        netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
        
        Greg Steuck <greg@nest.cx> points out that some of the netfilter
        headers can't be used in userspace without including linux/types.h
        first. The headers include their own linux/types.h include statements,
        these are stripped by make headers-install because they are inside
        #ifdef __KERNEL__ however. Move them out to fix this.
        
        Reported and Tested by Greg Steuck.
        
        Signed-off-by: Patrick McHardy <kaber@trash.net>
        Signed-off-by: David S. Miller <davem@davemloft.net>
    
    diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
    index e4c6659..0c5eb7e 100644
    a b  
    33 
    44#ifdef __KERNEL__ 
    55#include <linux/init.h> 
    6 #include <linux/types.h> 
    76#include <linux/skbuff.h> 
    87#include <linux/net.h> 
    98#include <linux/netdevice.h> 
     
    1413#include <linux/list.h> 
    1514#include <net/net_namespace.h> 
    1615#endif 
     16#include <linux/types.h> 
    1717#include <linux/compiler.h> 
    1818 
    1919/* Responses from hook functions. */ 
  • include/linux/netfilter_arp/arp_tables.h

    diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
    index dd9c97f..590ac3d 100644
    a b  
    1111 
    1212#ifdef __KERNEL__ 
    1313#include <linux/if.h> 
    14 #include <linux/types.h> 
    1514#include <linux/in.h> 
    1615#include <linux/if_arp.h> 
    1716#include <linux/skbuff.h> 
    1817#endif 
     18#include <linux/types.h> 
    1919#include <linux/compiler.h> 
    2020#include <linux/netfilter_arp.h> 
    2121 
  • include/linux/netfilter_ipv4/ip_tables.h

    diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
    index bfc889f..092bd50 100644
    a b  
    1717 
    1818#ifdef __KERNEL__ 
    1919#include <linux/if.h> 
    20 #include <linux/types.h> 
    2120#include <linux/in.h> 
    2221#include <linux/ip.h> 
    2322#include <linux/skbuff.h> 
    2423#endif 
     24#include <linux/types.h> 
    2525#include <linux/compiler.h> 
    2626#include <linux/netfilter_ipv4.h> 
    2727 
  • include/linux/netfilter_ipv6/ip6_tables.h

    diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
    index f2507dc..1089e33 100644
    a b  
    1717 
    1818#ifdef __KERNEL__ 
    1919#include <linux/if.h> 
    20 #include <linux/types.h> 
    2120#include <linux/in6.h> 
    2221#include <linux/ipv6.h> 
    2322#include <linux/skbuff.h> 
    2423#endif 
     24#include <linux/types.h> 
    2525#include <linux/compiler.h> 
    2626#include <linux/netfilter_ipv6.h> 
    2727 
Note: See TracBrowser for help on using the repository browser.