diff options
author | Patrick McHardy <kaber@trash.net> | 2006-08-22 03:34:04 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:55:32 -0400 |
commit | 4470bbc749e5551cce914529309456f631e25120 (patch) | |
tree | 972978df336c49235889dc745124fdfd1b990349 /net/netfilter/xt_physdev.c | |
parent | 52d9c42ef2563d2c420eb23b96bf5a4cae9e167b (diff) |
[NETFILTER]: x_tables: make use of mass registation helpers
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/xt_physdev.c')
-rw-r--r-- | net/netfilter/xt_physdev.c | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c index 63a96546746..af3d70f96ec 100644 --- a/net/netfilter/xt_physdev.c +++ b/net/netfilter/xt_physdev.c | |||
@@ -132,43 +132,34 @@ checkentry(const char *tablename, | |||
132 | return 1; | 132 | return 1; |
133 | } | 133 | } |
134 | 134 | ||
135 | static struct xt_match physdev_match = { | 135 | static struct xt_match xt_physdev_match[] = { |
136 | .name = "physdev", | 136 | { |
137 | .match = match, | 137 | .name = "physdev", |
138 | .matchsize = sizeof(struct xt_physdev_info), | 138 | .family = AF_INET, |
139 | .checkentry = checkentry, | 139 | .checkentry = checkentry, |
140 | .family = AF_INET, | 140 | .match = match, |
141 | .me = THIS_MODULE, | 141 | .matchsize = sizeof(struct xt_physdev_info), |
142 | }; | 142 | .me = THIS_MODULE, |
143 | 143 | }, | |
144 | static struct xt_match physdev6_match = { | 144 | { |
145 | .name = "physdev", | 145 | .name = "physdev", |
146 | .match = match, | 146 | .family = AF_INET6, |
147 | .matchsize = sizeof(struct xt_physdev_info), | 147 | .checkentry = checkentry, |
148 | .checkentry = checkentry, | 148 | .match = match, |
149 | .family = AF_INET6, | 149 | .matchsize = sizeof(struct xt_physdev_info), |
150 | .me = THIS_MODULE, | 150 | .me = THIS_MODULE, |
151 | }, | ||
151 | }; | 152 | }; |
152 | 153 | ||
153 | static int __init xt_physdev_init(void) | 154 | static int __init xt_physdev_init(void) |
154 | { | 155 | { |
155 | int ret; | 156 | return xt_register_matches(xt_physdev_match, |
156 | 157 | ARRAY_SIZE(xt_physdev_match)); | |
157 | ret = xt_register_match(&physdev_match); | ||
158 | if (ret < 0) | ||
159 | return ret; | ||
160 | |||
161 | ret = xt_register_match(&physdev6_match); | ||
162 | if (ret < 0) | ||
163 | xt_unregister_match(&physdev_match); | ||
164 | |||
165 | return ret; | ||
166 | } | 158 | } |
167 | 159 | ||
168 | static void __exit xt_physdev_fini(void) | 160 | static void __exit xt_physdev_fini(void) |
169 | { | 161 | { |
170 | xt_unregister_match(&physdev_match); | 162 | xt_unregister_matches(xt_physdev_match, ARRAY_SIZE(xt_physdev_match)); |
171 | xt_unregister_match(&physdev6_match); | ||
172 | } | 163 | } |
173 | 164 | ||
174 | module_init(xt_physdev_init); | 165 | module_init(xt_physdev_init); |