include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

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

diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 5f86f55..f9560f3 100644 (file)
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -29,6 +29,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/socket.h>
 #include <linux/skbuff.h>
@@ -246,20 +247,17 @@ static void ebt_log_packet(u_int8_t pf, unsigned int hooknum,
        ebt_ulog_packet(hooknum, skb, in, out, &loginfo, prefix);
 }
 
-static unsigned int ebt_ulog(const struct sk_buff *skb, unsigned int hooknr,
-   const struct net_device *in, const struct net_device *out,
-   const void *data, unsigned int datalen)
+static unsigned int
+ebt_ulog_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
-       const struct ebt_ulog_info *uloginfo = data;
-
-       ebt_ulog_packet(hooknr, skb, in, out, uloginfo, NULL);
+       ebt_ulog_packet(par->hooknum, skb, par->in, par->out,
+                       par->targinfo, NULL);
        return EBT_CONTINUE;
 }
 
-static bool ebt_ulog_check(const char *tablename, unsigned int hookmask,
-   const struct ebt_entry *e, void *data, unsigned int datalen)
+static bool ebt_ulog_tg_check(const struct xt_tgchk_param *par)
 {
-       struct ebt_ulog_info *uloginfo = data;
+       struct ebt_ulog_info *uloginfo = par->targinfo;
 
        if (uloginfo->nlgroup > 31)
                return false;
@@ -269,32 +267,34 @@ static bool ebt_ulog_check(const char *tablename, unsigned int hookmask,
        if (uloginfo->qthreshold > EBT_ULOG_MAX_QLEN)
                uloginfo->qthreshold = EBT_ULOG_MAX_QLEN;
 
-       return 0;
+       return true;
 }
 
-static struct ebt_watcher ulog __read_mostly = {
-       .name           = EBT_ULOG_WATCHER,
-       .watcher        = ebt_ulog,
-       .check          = ebt_ulog_check,
-       .targetsize     = XT_ALIGN(sizeof(struct ebt_ulog_info)),
+static struct xt_target ebt_ulog_tg_reg __read_mostly = {
+       .name           = "ulog",
+       .revision       = 0,
+       .family         = NFPROTO_BRIDGE,
+       .target         = ebt_ulog_tg,
+       .checkentry     = ebt_ulog_tg_check,
+       .targetsize     = sizeof(struct ebt_ulog_info),
        .me             = THIS_MODULE,
 };
 
-static const struct nf_logger ebt_ulog_logger = {
-       .name           = EBT_ULOG_WATCHER,
+static struct nf_logger ebt_ulog_logger __read_mostly = {
+       .name           = "ebt_ulog",
        .logfn          = &ebt_log_packet,
        .me             = THIS_MODULE,
 };
 
 static int __init ebt_ulog_init(void)
 {
-       bool ret = true;
+       int ret;
        int i;
 
        if (nlbufsiz >= 128*1024) {
                printk(KERN_NOTICE "ebt_ulog: Netlink buffer has to be <= 128kB,"
                       " please try a smaller nlbufsiz parameter.\n");
-               return false;
+               return -EINVAL;
        }
 
        /* initialize ulog_buffers */
@@ -309,12 +309,12 @@ static int __init ebt_ulog_init(void)
        if (!ebtulognl) {
                printk(KERN_WARNING KBUILD_MODNAME ": out of memory trying to "
                       "call netlink_kernel_create\n");
-               ret = false;
-       } else if (ebt_register_watcher(&ulog) != 0) {
+               ret = -ENOMEM;
+       } else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0) {
                netlink_kernel_release(ebtulognl);
        }
 
-       if (ret)
+       if (ret == 0)
                nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger);
 
        return ret;
@@ -326,7 +326,7 @@ static void __exit ebt_ulog_fini(void)
        int i;
 
        nf_log_unregister(&ebt_ulog_logger);
-       ebt_unregister_watcher(&ulog);
+       xt_unregister_target(&ebt_ulog_tg_reg);
        for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {
                ub = &ulog_buffers[i];
                if (timer_pending(&ub->timer))