diff options
author | Patrick McHardy <kaber@trash.net> | 2010-02-10 17:56:46 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-10 17:56:46 +0100 |
commit | a8c28d05150f758625c5da38199b247887735e65 (patch) | |
tree | cf1f40f49bc0b1049b7d0f63ba5622028f07b924 /include | |
parent | d0b0268fddea3235a8df35e52167c3b206bf2f5a (diff) | |
parent | e3eaa9910b380530cfd2c0670fcd3f627674da8a (diff) | |
download | kernel_samsung_espresso10-a8c28d05150f758625c5da38199b247887735e65.zip kernel_samsung_espresso10-a8c28d05150f758625c5da38199b247887735e65.tar.gz kernel_samsung_espresso10-a8c28d05150f758625c5da38199b247887735e65.tar.bz2 |
Merge branch 'master' of git://dev.medozas.de/linux
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netfilter/x_tables.h | 4 | ||||
-rw-r--r-- | include/linux/netfilter_arp/arp_tables.h | 1 | ||||
-rw-r--r-- | include/linux/netfilter_ipv4/ip_tables.h | 1 | ||||
-rw-r--r-- | include/linux/netfilter_ipv6/ip6_tables.h | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 9d671eb..a0a144a 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -360,6 +360,7 @@ struct xt_table { struct module *me; u_int8_t af; /* address/protocol family */ + int priority; /* hook order */ /* A unique name... */ const char name[XT_TABLE_MAXNAMELEN]; @@ -521,6 +522,9 @@ static inline unsigned long ifname_compare_aligned(const char *_a, return ret; } +extern struct nf_hook_ops *xt_hook_link(const struct xt_table *, nf_hookfn *); +extern void xt_hook_unlink(const struct xt_table *, struct nf_hook_ops *); + #ifdef CONFIG_COMPAT #include <net/compat.h> diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index f233652..0b33980 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h @@ -258,6 +258,7 @@ struct arpt_error { .target.errorname = "ERROR", \ } +extern void *arpt_alloc_initial_table(const struct xt_table *); extern struct xt_table *arpt_register_table(struct net *net, const struct xt_table *table, const struct arpt_replace *repl); diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index 8d1f273..364973b 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -282,6 +282,7 @@ struct ipt_error { .target.errorname = "ERROR", \ } +extern void *ipt_alloc_initial_table(const struct xt_table *); extern unsigned int ipt_do_table(struct sk_buff *skb, unsigned int hook, const struct net_device *in, diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index d2952d2..8031eb4 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -297,6 +297,7 @@ ip6t_get_target(struct ip6t_entry *e) #include <linux/init.h> extern void ip6t_init(void) __init; +extern void *ip6t_alloc_initial_table(const struct xt_table *); extern struct xt_table *ip6t_register_table(struct net *net, const struct xt_table *table, const struct ip6t_replace *repl); |