IPv6: fix race between cleanup and add/delete address

[linux-2.6.git] / net / netfilter / xt_realm.c

diff --git a/net/netfilter/xt_realm.c b/net/netfilter/xt_realm.c
index 97ffc2fbc19d907a5f3fedc1f056d8714c51404f..484d1689bfde167d43474b3eeb35947b073e026c 100644 (file)
--- a/net/netfilter/xt_realm.c
+++ b/net/netfilter/xt_realm.c
@@ -1,6 +1,4 @@
 /* IP tables module for matching the routing realm
- *
- * $Id: ipt_realm.c,v 1.3 2004/03/05 13:25:40 laforge Exp $
  *
  * (C) 2003 by Sampsa Ranta <sampsa@netsonic.fi>
  *
@@ -20,44 +18,37 @@
 
 MODULE_AUTHOR("Sampsa Ranta <sampsa@netsonic.fi>");
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("X_tables realm match");
+MODULE_DESCRIPTION("Xtables: Routing realm match");
 MODULE_ALIAS("ipt_realm");
 
-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)
+static bool
+realm_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       const struct xt_realm_info *info = matchinfo;
-       struct dst_entry *dst = skb->dst;
+       const struct xt_realm_info *info = par->matchinfo;
+       const struct dst_entry *dst = skb_dst(skb);
 
        return (info->id == (dst->tclassid & info->mask)) ^ info->invert;
 }
 
-static struct xt_match realm_match = {
+static struct xt_match realm_mt_reg __read_mostly = {
        .name           = "realm",
-       .match          = match,
+       .match          = realm_mt,
        .matchsize      = sizeof(struct xt_realm_info),
-       .hooks          = (1 << NF_IP_POST_ROUTING) | (1 << NF_IP_FORWARD) |
-                         (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_LOCAL_IN),
-       .family         = AF_INET,
+       .hooks          = (1 << NF_INET_POST_ROUTING) | (1 << NF_INET_FORWARD) |
+                         (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_LOCAL_IN),
+       .family         = NFPROTO_UNSPEC,
        .me             = THIS_MODULE
 };
 
-static int __init xt_realm_init(void)
+static int __init realm_mt_init(void)
 {
-       return xt_register_match(&realm_match);
+       return xt_register_match(&realm_mt_reg);
 }
 
-static void __exit xt_realm_fini(void)
+static void __exit realm_mt_exit(void)
 {
-       xt_unregister_match(&realm_match);
+       xt_unregister_match(&realm_mt_reg);
 }
 
-module_init(xt_realm_init);
-module_exit(xt_realm_fini);
+module_init(realm_mt_init);
+module_exit(realm_mt_exit);