[NETFILTER]: x_tables: set the protocol family in x_tables targets/matches

[linux-2.6] / net / netfilter / xt_CLASSIFY.c

diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
index 6b36e84756577fca069ad63ca777771386b63a77..3cd2ac90a25b3ad6318f247fdd68e6283a79f5a7 100644 (file)
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -28,6 +28,7 @@ target(struct sk_buff **pskb,
        const struct net_device *in,
        const struct net_device *out,
        unsigned int hooknum,
+       const struct xt_target *target,
        const void *targinfo,
        void *userinfo)
 {
@@ -46,6 +47,7 @@ static struct xt_target classify_reg = {
        .table          = "mangle",
        .hooks          = (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_FORWARD) |
                          (1 << NF_IP_POST_ROUTING),
+       .family         = AF_INET,
        .me             = THIS_MODULE,
 };
 static struct xt_target classify6_reg = { 
@@ -55,6 +57,7 @@ static struct xt_target classify6_reg = {
        .table          = "mangle",
        .hooks          = (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_FORWARD) |
                          (1 << NF_IP_POST_ROUTING),
+       .family         = AF_INET6,
        .me             = THIS_MODULE,
 };
 
@@ -63,21 +66,21 @@ static int __init init(void)
 {
        int ret;
 
-       ret = xt_register_target(AF_INET, &classify_reg);
+       ret = xt_register_target(&classify_reg);
        if (ret)
                return ret;
 
-       ret = xt_register_target(AF_INET6, &classify6_reg);
+       ret = xt_register_target(&classify6_reg);
        if (ret)
-               xt_unregister_target(AF_INET, &classify_reg);
+               xt_unregister_target(&classify_reg);
 
        return ret;
 }
 
 static void __exit fini(void)
 {
-       xt_unregister_target(AF_INET, &classify_reg);
-       xt_unregister_target(AF_INET6, &classify6_reg);
+       xt_unregister_target(&classify_reg);
+       xt_unregister_target(&classify6_reg);
 }
 
 module_init(init);