diff options
| author |   Patrick McHardy <kaber@trash.net> | 2010-03-18 12:55:50 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-03-18 12:55:50 +0100 |
| commit | e8a96f69383f3d88cdc06d8ccd450f70c48628a3 (patch) | |
| tree | b8ce41ee20eb379731e7592d7b6fb17471918a61 /include/linux | |
| parent | netfilter: remove unused headers in net/netfilter/nfnetlink.c (diff) | |
| parent | netfilter: net/netfilter/ipvs/ip_vs_ftp.c: Remove use of NIPQUAD (diff) | |
| download | linux-dev-e8a96f69383f3d88cdc06d8ccd450f70c48628a3.tar.xz linux-dev-e8a96f69383f3d88cdc06d8ccd450f70c48628a3.zip | |
Merge branch 'master' of ../nf-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_tuple_common.h | 3 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6_tables.h | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/netfilter/nf_conntrack_tuple_common.h b/include/linux/netfilter/nf_conntrack_tuple_common.h index 8e145f0d61cb..2ea22b018a87 100644 --- a/include/linux/netfilter/nf_conntrack_tuple_common.h +++ b/include/linux/netfilter/nf_conntrack_tuple_common.h @@ -1,8 +1,7 @@ #ifndef _NF_CONNTRACK_TUPLE_COMMON_H #define _NF_CONNTRACK_TUPLE_COMMON_H -enum ip_conntrack_dir -{ +enum ip_conntrack_dir { IP_CT_DIR_ORIGINAL, IP_CT_DIR_REPLY, IP_CT_DIR_MAX diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index e5ba03d783c6..18442ff19c07 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -316,10 +316,6 @@ extern int ip6t_ext_hdr(u8 nexthdr); extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset, int target, unsigned short *fragoff); -extern int ip6_masked_addrcmp(const struct in6_addr *addr1, - const struct in6_addr *mask, - const struct in6_addr *addr2); - #define IP6T_ALIGN(s) XT_ALIGN(s) #ifdef CONFIG_COMPAT |