diff options
| author | Harald Welte <laforge@netfilter.org> | 2005-01-11 05:46:01 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@coreworks.de> | 2005-01-11 05:46:01 +0100 |
| commit | 8284061e46c8ce5995426e832194bc3af2b9650d (patch) | |
| tree | 2560a27a3f944d68f0db469ee4a55de934914c3b /include/linux | |
| parent | acadabc75c75efe3e3681dd407e835b7c49eee27 (diff) | |
[NETFILTER] re-introduce __initdata to {arp,ip,ip6}_tables
Instead of just removing the (correct) __initdata as introduced by
http://linux.bkbits.net:8080/linux-2.5/cset@1.2055.4.50
we rework the code in order to not trigger some misinterpretation by
static code checkers.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_arp/arp_tables.h | 6 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_tables.h | 6 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6_tables.h | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index d6a7188b525c..b16b4799e27e 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h @@ -312,9 +312,6 @@ struct arpt_table /* A unique name... */ char name[ARPT_TABLE_MAXNAMELEN]; - /* Seed table: copied in register_table */ - struct arpt_replace *table; - /* What hooks you will enter on */ unsigned int valid_hooks; @@ -328,7 +325,8 @@ struct arpt_table struct module *me; }; -extern int arpt_register_table(struct arpt_table *table); +extern int arpt_register_table(struct arpt_table *table, + const struct arpt_replace *repl); extern void arpt_unregister_table(struct arpt_table *table); extern unsigned int arpt_do_table(struct sk_buff **pskb, unsigned int hook, diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index e9617993a70a..91f3594d3bfd 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -440,9 +440,6 @@ struct ipt_table /* A unique name... */ char name[IPT_TABLE_MAXNAMELEN]; - /* Seed table: copied in register_table */ - struct ipt_replace *table; - /* What hooks you will enter on */ unsigned int valid_hooks; @@ -478,7 +475,8 @@ struct ipt_error struct ipt_error_target target; }; -extern int ipt_register_table(struct ipt_table *table); +extern int ipt_register_table(struct ipt_table *table, + const struct ipt_replace *repl); extern void ipt_unregister_table(struct ipt_table *table); extern unsigned int ipt_do_table(struct sk_buff **pskb, unsigned int hook, diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index d6ac08c14dc1..8fa1bf0104ee 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -429,9 +429,6 @@ struct ip6t_table /* A unique name... */ char name[IP6T_TABLE_MAXNAMELEN]; - /* Seed table: copied in register_table */ - struct ip6t_replace *table; - /* What hooks you will enter on */ unsigned int valid_hooks; @@ -445,7 +442,8 @@ struct ip6t_table struct module *me; }; -extern int ip6t_register_table(struct ip6t_table *table); +extern int ip6t_register_table(struct ip6t_table *table, + const struct ip6t_replace *repl); extern void ip6t_unregister_table(struct ip6t_table *table); extern unsigned int ip6t_do_table(struct sk_buff **pskb, unsigned int hook, |