diff options
| author | Hideaki Yoshifuji <yoshfuji@linux-ipv6.org> | 2004-06-18 21:55:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-06-18 21:55:24 -0700 |
| commit | c3b2adbfeb9e3bbf898cf824df21ac822a95348a (patch) | |
| tree | 1aa26150c235be9bd0795540a56776cdd8d1010a /include/linux | |
| parent | 2db233d60ee3234a2fe4188529aacdf9d1884e00 (diff) | |
[NET]: Fix some userland header bustage.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter.h | 1 | ||||
| -rw-r--r-- | include/linux/netfilter_arp/arp_tables.h | 2 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_tables.h | 3 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6_tables.h | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index b20c79258825..83f9668653ca 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -10,6 +10,7 @@ #include <linux/wait.h> #include <linux/list.h> #endif +#include <linux/compiler.h> /* Responses from hook functions. */ #define NF_DROP 0 diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index 78c4f7142267..d6a7188b525c 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h @@ -16,7 +16,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #endif - +#include <linux/compiler.h> #include <linux/netfilter_arp.h> #define ARPT_FUNCTION_MAXNAMELEN 30 diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index f43f1dddebc4..dccc68052c88 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -22,6 +22,7 @@ #include <linux/ip.h> #include <linux/skbuff.h> #endif +#include <linux/compiler.h> #include <linux/netfilter_ipv4.h> #define IPT_FUNCTION_MAXNAMELEN 30 @@ -336,8 +337,8 @@ ipt_get_target(struct ipt_entry *e) /* * Main firewall chains definitions and global var's definitions. */ -static DECLARE_MUTEX(ipt_mutex); #ifdef __KERNEL__ +static DECLARE_MUTEX(ipt_mutex); #include <linux/init.h> extern void ipt_init(void) __init; diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index a0995271934a..f9983d16cc1c 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -22,6 +22,7 @@ #include <linux/ipv6.h> #include <linux/skbuff.h> #endif +#include <linux/compiler.h> #include <linux/netfilter_ipv6.h> #define IP6T_FUNCTION_MAXNAMELEN 30 @@ -106,7 +107,9 @@ struct ip6t_counters u_int64_t pcnt, bcnt; /* Packet and byte counters */ }; +#ifdef __KERNEL__ static DECLARE_MUTEX(ip6t_mutex); +#endif /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */ #define IP6T_F_PROTO 0x01 /* Set if rule cares about upper |