diff options
author | Patrick McHardy <kaber@trash.net> | 2010-02-10 11:56:46 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-10 11:56:46 -0500 |
commit | a8c28d05150f758625c5da38199b247887735e65 (patch) | |
tree | cf1f40f49bc0b1049b7d0f63ba5622028f07b924 /include | |
parent | d0b0268fddea3235a8df35e52167c3b206bf2f5a (diff) | |
parent | e3eaa9910b380530cfd2c0670fcd3f627674da8a (diff) |
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 9d671ebf0605..a0a144a6c6d9 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
@@ -360,6 +360,7 @@ struct xt_table { | |||
360 | struct module *me; | 360 | struct module *me; |
361 | 361 | ||
362 | u_int8_t af; /* address/protocol family */ | 362 | u_int8_t af; /* address/protocol family */ |
363 | int priority; /* hook order */ | ||
363 | 364 | ||
364 | /* A unique name... */ | 365 | /* A unique name... */ |
365 | const char name[XT_TABLE_MAXNAMELEN]; | 366 | const char name[XT_TABLE_MAXNAMELEN]; |
@@ -521,6 +522,9 @@ static inline unsigned long ifname_compare_aligned(const char *_a, | |||
521 | return ret; | 522 | return ret; |
522 | } | 523 | } |
523 | 524 | ||
525 | extern struct nf_hook_ops *xt_hook_link(const struct xt_table *, nf_hookfn *); | ||
526 | extern void xt_hook_unlink(const struct xt_table *, struct nf_hook_ops *); | ||
527 | |||
524 | #ifdef CONFIG_COMPAT | 528 | #ifdef CONFIG_COMPAT |
525 | #include <net/compat.h> | 529 | #include <net/compat.h> |
526 | 530 | ||
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index f2336523a9df..0b33980611b2 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h | |||
@@ -258,6 +258,7 @@ struct arpt_error { | |||
258 | .target.errorname = "ERROR", \ | 258 | .target.errorname = "ERROR", \ |
259 | } | 259 | } |
260 | 260 | ||
261 | extern void *arpt_alloc_initial_table(const struct xt_table *); | ||
261 | extern struct xt_table *arpt_register_table(struct net *net, | 262 | extern struct xt_table *arpt_register_table(struct net *net, |
262 | const struct xt_table *table, | 263 | const struct xt_table *table, |
263 | const struct arpt_replace *repl); | 264 | const struct arpt_replace *repl); |
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index 8d1f273d350b..364973b42133 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h | |||
@@ -282,6 +282,7 @@ struct ipt_error { | |||
282 | .target.errorname = "ERROR", \ | 282 | .target.errorname = "ERROR", \ |
283 | } | 283 | } |
284 | 284 | ||
285 | extern void *ipt_alloc_initial_table(const struct xt_table *); | ||
285 | extern unsigned int ipt_do_table(struct sk_buff *skb, | 286 | extern unsigned int ipt_do_table(struct sk_buff *skb, |
286 | unsigned int hook, | 287 | unsigned int hook, |
287 | const struct net_device *in, | 288 | const struct net_device *in, |
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index d2952d2fa658..8031eb486a10 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) | |||
297 | #include <linux/init.h> | 297 | #include <linux/init.h> |
298 | extern void ip6t_init(void) __init; | 298 | extern void ip6t_init(void) __init; |
299 | 299 | ||
300 | extern void *ip6t_alloc_initial_table(const struct xt_table *); | ||
300 | extern struct xt_table *ip6t_register_table(struct net *net, | 301 | extern struct xt_table *ip6t_register_table(struct net *net, |
301 | const struct xt_table *table, | 302 | const struct xt_table *table, |
302 | const struct ip6t_replace *repl); | 303 | const struct ip6t_replace *repl); |