fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/net/netfilter/xt_mac.c b/net/netfilter/xt_mac.c
index 0461dcb..425fc21 100644 (file)
--- a/net/netfilter/xt_mac.c
+++ b/net/netfilter/xt_mac.c
@@ -27,6 +27,7 @@ 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,
@@ -42,59 +43,38 @@ match(const struct sk_buff *skb,
                ^ info->invert));
 }
 
-static int
-ipt_mac_checkentry(const char *tablename,
-                  const void *inf,
-                  void *matchinfo,
-                  unsigned int matchsize,
-                  unsigned int hook_mask)
-{
-       /* FORWARD isn't always valid, but it's nice to be able to do --RR */
-       if (hook_mask
-           & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN)
-               | (1 << NF_IP_FORWARD))) {
-               printk("xt_mac: only valid for PRE_ROUTING, LOCAL_IN or FORWARD.\n");
-               return 0;
-       }
-
-       if (matchsize != XT_ALIGN(sizeof(struct xt_mac_info)))
-               return 0;
-
-       return 1;
-}
-
-static struct xt_match mac_match = {
-       .name           = "mac",
-       .match          = &match,
-       .checkentry     = &ipt_mac_checkentry,
-       .me             = THIS_MODULE,
-};
-static struct xt_match mac6_match = {
-       .name           = "mac",
-       .match          = &match,
-       .checkentry     = &ipt_mac_checkentry,
-       .me             = THIS_MODULE,
+static struct xt_match xt_mac_match[] = {
+       {
+               .name           = "mac",
+               .family         = AF_INET,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_mac_info),
+               .hooks          = (1 << NF_IP_PRE_ROUTING) |
+                                 (1 << NF_IP_LOCAL_IN) |
+                                 (1 << NF_IP_FORWARD),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "mac",
+               .family         = AF_INET6,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_mac_info),
+               .hooks          = (1 << NF_IP_PRE_ROUTING) |
+                                 (1 << NF_IP_LOCAL_IN) |
+                                 (1 << NF_IP_FORWARD),
+               .me             = THIS_MODULE,
+       },
 };
 
-static int __init init(void)
+static int __init xt_mac_init(void)
 {
-       int ret;
-       ret = xt_register_match(AF_INET, &mac_match);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(AF_INET6, &mac6_match);
-       if (ret)
-               xt_unregister_match(AF_INET, &mac_match);
-
-       return ret;
+       return xt_register_matches(xt_mac_match, ARRAY_SIZE(xt_mac_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_mac_fini(void)
 {
-       xt_unregister_match(AF_INET, &mac_match);
-       xt_unregister_match(AF_INET6, &mac6_match);
+       xt_unregister_matches(xt_mac_match, ARRAY_SIZE(xt_mac_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_mac_init);
+module_exit(xt_mac_fini);