[NETFILTER]: x_tables: remove some unnecessary casts

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

diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c
index c3efd3773d75762b8d8bc0a0a104a945b7e43284..0ebb6ac2c8c769a2b1a19075d10dc35a1143a32a 100644 (file)
--- a/net/netfilter/xt_string.c
+++ b/net/netfilter/xt_string.c
@@ -24,13 +24,14 @@ MODULE_ALIAS("ip6t_string");
 static int match(const struct sk_buff *skb,
                 const struct net_device *in,
                 const struct net_device *out,
+                const struct xt_match *match,
                 const void *matchinfo,
                 int offset,
                 unsigned int protoff,
                 int *hotdrop)
 {
+       const struct xt_string_info *conf = matchinfo;
        struct ts_state state;
-       struct xt_string_info *conf = (struct xt_string_info *) matchinfo;
 
        memset(&state, 0, sizeof(struct ts_state));
 
@@ -43,6 +44,7 @@ static int match(const struct sk_buff *skb,
 
 static int checkentry(const char *tablename,
                      const void *ip,
+                     const struct xt_match *match,
                      void *matchinfo,
                      unsigned int matchsize,
                      unsigned int hook_mask)
@@ -64,7 +66,8 @@ static int checkentry(const char *tablename,
        return 1;
 }
 
-static void destroy(void *matchinfo, unsigned int matchsize)
+static void destroy(const struct xt_match *match, void *matchinfo,
+                   unsigned int matchsize)
 {
        textsearch_destroy(STRING_TEXT_PRIV(matchinfo)->config);
 }
@@ -75,6 +78,7 @@ static struct xt_match string_match = {
        .matchsize      = sizeof(struct xt_string_info),
        .checkentry     = checkentry,
        .destroy        = destroy,
+       .family         = AF_INET,
        .me             = THIS_MODULE
 };
 static struct xt_match string6_match = {
@@ -83,28 +87,29 @@ static struct xt_match string6_match = {
        .matchsize      = sizeof(struct xt_string_info),
        .checkentry     = checkentry,
        .destroy        = destroy,
+       .family         = AF_INET6,
        .me             = THIS_MODULE
 };
 
-static int __init init(void)
+static int __init xt_string_init(void)
 {
        int ret;
 
-       ret = xt_register_match(AF_INET, &string_match);
+       ret = xt_register_match(&string_match);
        if (ret)
                return ret;
-       ret = xt_register_match(AF_INET6, &string6_match);
+       ret = xt_register_match(&string6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &string_match);
+               xt_unregister_match(&string_match);
 
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_string_fini(void)
 {
-       xt_unregister_match(AF_INET, &string_match);
-       xt_unregister_match(AF_INET6, &string6_match);
+       xt_unregister_match(&string_match);
+       xt_unregister_match(&string6_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_string_init);
+module_exit(xt_string_fini);