diff options
author | Jan Engelhardt <jengelh@gmx.de> | 2007-02-07 18:12:33 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 15:39:20 -0500 |
commit | e60a13e030867078f3c9fef8dca6cd8a5b883478 (patch) | |
tree | 773c26ade3f4d3f88fb83cc8044d35cbe0a01cbe /net/ipv4 | |
parent | 6709dbbb1978abe039ea4b76c364bf003bf40de5 (diff) |
[NETFILTER]: {ip,ip6}_tables: use struct xt_table instead of redefined structure names
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/ip_nat_rule.c | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 20 | ||||
-rw-r--r-- | net/ipv4/netfilter/iptable_filter.c | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/iptable_mangle.c | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/iptable_raw.c | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_rule.c | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/net/ipv4/netfilter/ip_nat_rule.c b/net/ipv4/netfilter/ip_nat_rule.c index 7a8e7bb577e2..e1c8a05f3dc6 100644 --- a/net/ipv4/netfilter/ip_nat_rule.c +++ b/net/ipv4/netfilter/ip_nat_rule.c | |||
@@ -86,7 +86,7 @@ static struct | |||
86 | } | 86 | } |
87 | }; | 87 | }; |
88 | 88 | ||
89 | static struct ipt_table nat_table = { | 89 | static struct xt_table nat_table = { |
90 | .name = "nat", | 90 | .name = "nat", |
91 | .valid_hooks = NAT_VALID_HOOKS, | 91 | .valid_hooks = NAT_VALID_HOOKS, |
92 | .lock = RW_LOCK_UNLOCKED, | 92 | .lock = RW_LOCK_UNLOCKED, |
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 0043e908b130..5a7b3a341389 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
@@ -216,7 +216,7 @@ ipt_do_table(struct sk_buff **pskb, | |||
216 | unsigned int hook, | 216 | unsigned int hook, |
217 | const struct net_device *in, | 217 | const struct net_device *in, |
218 | const struct net_device *out, | 218 | const struct net_device *out, |
219 | struct ipt_table *table) | 219 | struct xt_table *table) |
220 | { | 220 | { |
221 | static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long)))); | 221 | static const char nulldevname[IFNAMSIZ] __attribute__((aligned(sizeof(long)))); |
222 | u_int16_t offset; | 222 | u_int16_t offset; |
@@ -818,7 +818,7 @@ get_counters(const struct xt_table_info *t, | |||
818 | } | 818 | } |
819 | } | 819 | } |
820 | 820 | ||
821 | static inline struct xt_counters * alloc_counters(struct ipt_table *table) | 821 | static inline struct xt_counters * alloc_counters(struct xt_table *table) |
822 | { | 822 | { |
823 | unsigned int countersize; | 823 | unsigned int countersize; |
824 | struct xt_counters *counters; | 824 | struct xt_counters *counters; |
@@ -843,7 +843,7 @@ static inline struct xt_counters * alloc_counters(struct ipt_table *table) | |||
843 | 843 | ||
844 | static int | 844 | static int |
845 | copy_entries_to_user(unsigned int total_size, | 845 | copy_entries_to_user(unsigned int total_size, |
846 | struct ipt_table *table, | 846 | struct xt_table *table, |
847 | void __user *userptr) | 847 | void __user *userptr) |
848 | { | 848 | { |
849 | unsigned int off, num; | 849 | unsigned int off, num; |
@@ -1046,7 +1046,7 @@ static int compat_table_info(struct xt_table_info *info, | |||
1046 | static int get_info(void __user *user, int *len, int compat) | 1046 | static int get_info(void __user *user, int *len, int compat) |
1047 | { | 1047 | { |
1048 | char name[IPT_TABLE_MAXNAMELEN]; | 1048 | char name[IPT_TABLE_MAXNAMELEN]; |
1049 | struct ipt_table *t; | 1049 | struct xt_table *t; |
1050 | int ret; | 1050 | int ret; |
1051 | 1051 | ||
1052 | if (*len != sizeof(struct ipt_getinfo)) { | 1052 | if (*len != sizeof(struct ipt_getinfo)) { |
@@ -1107,7 +1107,7 @@ get_entries(struct ipt_get_entries __user *uptr, int *len) | |||
1107 | { | 1107 | { |
1108 | int ret; | 1108 | int ret; |
1109 | struct ipt_get_entries get; | 1109 | struct ipt_get_entries get; |
1110 | struct ipt_table *t; | 1110 | struct xt_table *t; |
1111 | 1111 | ||
1112 | if (*len < sizeof(get)) { | 1112 | if (*len < sizeof(get)) { |
1113 | duprintf("get_entries: %u < %d\n", *len, | 1113 | duprintf("get_entries: %u < %d\n", *len, |
@@ -1151,7 +1151,7 @@ __do_replace(const char *name, unsigned int valid_hooks, | |||
1151 | void __user *counters_ptr) | 1151 | void __user *counters_ptr) |
1152 | { | 1152 | { |
1153 | int ret; | 1153 | int ret; |
1154 | struct ipt_table *t; | 1154 | struct xt_table *t; |
1155 | struct xt_table_info *oldinfo; | 1155 | struct xt_table_info *oldinfo; |
1156 | struct xt_counters *counters; | 1156 | struct xt_counters *counters; |
1157 | void *loc_cpu_old_entry; | 1157 | void *loc_cpu_old_entry; |
@@ -1302,7 +1302,7 @@ do_add_counters(void __user *user, unsigned int len, int compat) | |||
1302 | char *name; | 1302 | char *name; |
1303 | int size; | 1303 | int size; |
1304 | void *ptmp; | 1304 | void *ptmp; |
1305 | struct ipt_table *t; | 1305 | struct xt_table *t; |
1306 | struct xt_table_info *private; | 1306 | struct xt_table_info *private; |
1307 | int ret = 0; | 1307 | int ret = 0; |
1308 | void *loc_cpu_entry; | 1308 | void *loc_cpu_entry; |
@@ -1795,7 +1795,7 @@ struct compat_ipt_get_entries | |||
1795 | }; | 1795 | }; |
1796 | 1796 | ||
1797 | static int compat_copy_entries_to_user(unsigned int total_size, | 1797 | static int compat_copy_entries_to_user(unsigned int total_size, |
1798 | struct ipt_table *table, void __user *userptr) | 1798 | struct xt_table *table, void __user *userptr) |
1799 | { | 1799 | { |
1800 | unsigned int off, num; | 1800 | unsigned int off, num; |
1801 | struct compat_ipt_entry e; | 1801 | struct compat_ipt_entry e; |
@@ -1869,7 +1869,7 @@ compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len) | |||
1869 | { | 1869 | { |
1870 | int ret; | 1870 | int ret; |
1871 | struct compat_ipt_get_entries get; | 1871 | struct compat_ipt_get_entries get; |
1872 | struct ipt_table *t; | 1872 | struct xt_table *t; |
1873 | 1873 | ||
1874 | 1874 | ||
1875 | if (*len < sizeof(get)) { | 1875 | if (*len < sizeof(get)) { |
@@ -2052,7 +2052,7 @@ int ipt_register_table(struct xt_table *table, const struct ipt_replace *repl) | |||
2052 | return 0; | 2052 | return 0; |
2053 | } | 2053 | } |
2054 | 2054 | ||
2055 | void ipt_unregister_table(struct ipt_table *table) | 2055 | void ipt_unregister_table(struct xt_table *table) |
2056 | { | 2056 | { |
2057 | struct xt_table_info *private; | 2057 | struct xt_table_info *private; |
2058 | void *loc_cpu_entry; | 2058 | void *loc_cpu_entry; |
diff --git a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c index e2e7dd8d7903..51053cb42f43 100644 --- a/net/ipv4/netfilter/iptable_filter.c +++ b/net/ipv4/netfilter/iptable_filter.c | |||
@@ -74,7 +74,7 @@ static struct | |||
74 | } | 74 | } |
75 | }; | 75 | }; |
76 | 76 | ||
77 | static struct ipt_table packet_filter = { | 77 | static struct xt_table packet_filter = { |
78 | .name = "filter", | 78 | .name = "filter", |
79 | .valid_hooks = FILTER_VALID_HOOKS, | 79 | .valid_hooks = FILTER_VALID_HOOKS, |
80 | .lock = RW_LOCK_UNLOCKED, | 80 | .lock = RW_LOCK_UNLOCKED, |
diff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c index af2939889444..a532e4d84332 100644 --- a/net/ipv4/netfilter/iptable_mangle.c +++ b/net/ipv4/netfilter/iptable_mangle.c | |||
@@ -103,7 +103,7 @@ static struct | |||
103 | } | 103 | } |
104 | }; | 104 | }; |
105 | 105 | ||
106 | static struct ipt_table packet_mangler = { | 106 | static struct xt_table packet_mangler = { |
107 | .name = "mangle", | 107 | .name = "mangle", |
108 | .valid_hooks = MANGLE_VALID_HOOKS, | 108 | .valid_hooks = MANGLE_VALID_HOOKS, |
109 | .lock = RW_LOCK_UNLOCKED, | 109 | .lock = RW_LOCK_UNLOCKED, |
diff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c index bcbeb4aeacd9..5277550fa6b5 100644 --- a/net/ipv4/netfilter/iptable_raw.c +++ b/net/ipv4/netfilter/iptable_raw.c | |||
@@ -79,7 +79,7 @@ static struct | |||
79 | } | 79 | } |
80 | }; | 80 | }; |
81 | 81 | ||
82 | static struct ipt_table packet_raw = { | 82 | static struct xt_table packet_raw = { |
83 | .name = "raw", | 83 | .name = "raw", |
84 | .valid_hooks = RAW_VALID_HOOKS, | 84 | .valid_hooks = RAW_VALID_HOOKS, |
85 | .lock = RW_LOCK_UNLOCKED, | 85 | .lock = RW_LOCK_UNLOCKED, |
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c index de25d63f543c..7f95b4e2eb31 100644 --- a/net/ipv4/netfilter/nf_nat_rule.c +++ b/net/ipv4/netfilter/nf_nat_rule.c | |||
@@ -119,7 +119,7 @@ static struct | |||
119 | } | 119 | } |
120 | }; | 120 | }; |
121 | 121 | ||
122 | static struct ipt_table nat_table = { | 122 | static struct xt_table nat_table = { |
123 | .name = "nat", | 123 | .name = "nat", |
124 | .valid_hooks = NAT_VALID_HOOKS, | 124 | .valid_hooks = NAT_VALID_HOOKS, |
125 | .lock = RW_LOCK_UNLOCKED, | 125 | .lock = RW_LOCK_UNLOCKED, |