diff options
Diffstat (limited to 'net/netfilter/xt_u32.c')
-rw-r--r-- | net/netfilter/xt_u32.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/net/netfilter/xt_u32.c b/net/netfilter/xt_u32.c index ed9f8340611..a6b971dc5d3 100644 --- a/net/netfilter/xt_u32.c +++ b/net/netfilter/xt_u32.c | |||
@@ -99,31 +99,23 @@ u32_mt(const struct sk_buff *skb, const struct net_device *in, | |||
99 | return ret ^ data->invert; | 99 | return ret ^ data->invert; |
100 | } | 100 | } |
101 | 101 | ||
102 | static struct xt_match u32_mt_reg[] __read_mostly = { | 102 | static struct xt_match xt_u32_mt_reg __read_mostly = { |
103 | { | 103 | .name = "u32", |
104 | .name = "u32", | 104 | .revision = 0, |
105 | .family = NFPROTO_IPV4, | 105 | .family = NFPROTO_UNSPEC, |
106 | .match = u32_mt, | 106 | .match = u32_mt, |
107 | .matchsize = sizeof(struct xt_u32), | 107 | .matchsize = sizeof(struct xt_u32), |
108 | .me = THIS_MODULE, | 108 | .me = THIS_MODULE, |
109 | }, | ||
110 | { | ||
111 | .name = "u32", | ||
112 | .family = NFPROTO_IPV6, | ||
113 | .match = u32_mt, | ||
114 | .matchsize = sizeof(struct xt_u32), | ||
115 | .me = THIS_MODULE, | ||
116 | }, | ||
117 | }; | 109 | }; |
118 | 110 | ||
119 | static int __init u32_mt_init(void) | 111 | static int __init u32_mt_init(void) |
120 | { | 112 | { |
121 | return xt_register_matches(u32_mt_reg, ARRAY_SIZE(u32_mt_reg)); | 113 | return xt_register_match(&xt_u32_mt_reg); |
122 | } | 114 | } |
123 | 115 | ||
124 | static void __exit u32_mt_exit(void) | 116 | static void __exit u32_mt_exit(void) |
125 | { | 117 | { |
126 | xt_unregister_matches(u32_mt_reg, ARRAY_SIZE(u32_mt_reg)); | 118 | xt_unregister_match(&xt_u32_mt_reg); |
127 | } | 119 | } |
128 | 120 | ||
129 | module_init(u32_mt_init); | 121 | module_init(u32_mt_init); |