sunrpc: fix build-time warning

[safe/jmp/linux-2.6] / net / netfilter / xt_NOTRACK.c

diff --git a/net/netfilter/xt_NOTRACK.c b/net/netfilter/xt_NOTRACK.c
index 4976ce1..e7a0a54 100644 (file)
--- a/net/netfilter/xt_NOTRACK.c
+++ b/net/netfilter/xt_NOTRACK.c
@@ -7,17 +7,13 @@
 #include <linux/netfilter/x_tables.h>
 #include <net/netfilter/nf_conntrack.h>
 
+MODULE_DESCRIPTION("Xtables: Disabling connection tracking for packets");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_NOTRACK");
 MODULE_ALIAS("ip6t_NOTRACK");
 
 static unsigned int
-target(struct sk_buff *skb,
-       const struct net_device *in,
-       const struct net_device *out,
-       unsigned int hooknum,
-       const struct xt_target *target,
-       const void *targinfo)
+notrack_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
        /* Previously seen (loopback)? Ignore. */
        if (skb->nfct != NULL)
@@ -34,33 +30,24 @@ target(struct sk_buff *skb,
        return XT_CONTINUE;
 }
 
-static struct xt_target xt_notrack_target[] __read_mostly = {
-       {
-               .name           = "NOTRACK",
-               .family         = AF_INET,
-               .target         = target,
-               .table          = "raw",
-               .me             = THIS_MODULE,
-       },
-       {
-               .name           = "NOTRACK",
-               .family         = AF_INET6,
-               .target         = target,
-               .table          = "raw",
-               .me             = THIS_MODULE,
-       },
+static struct xt_target notrack_tg_reg __read_mostly = {
+       .name     = "NOTRACK",
+       .revision = 0,
+       .family   = NFPROTO_UNSPEC,
+       .target   = notrack_tg,
+       .table    = "raw",
+       .me       = THIS_MODULE,
 };
 
-static int __init xt_notrack_init(void)
+static int __init notrack_tg_init(void)
 {
-       return xt_register_targets(xt_notrack_target,
-                                  ARRAY_SIZE(xt_notrack_target));
+       return xt_register_target(&notrack_tg_reg);
 }
 
-static void __exit xt_notrack_fini(void)
+static void __exit notrack_tg_exit(void)
 {
-       xt_unregister_targets(xt_notrack_target, ARRAY_SIZE(xt_notrack_target));
+       xt_unregister_target(&notrack_tg_reg);
 }
 
-module_init(xt_notrack_init);
-module_exit(xt_notrack_fini);
+module_init(notrack_tg_init);
+module_exit(notrack_tg_exit);