[NETFILTER]: xt_mac/xt_CLASSIFY: use IPv6 hook names for IPv6 registration

[powerpc.git] / net / netfilter / xt_mac.c

diff --git a/net/netfilter/xt_mac.c b/net/netfilter/xt_mac.c
index b4559a4..d430d90 100644 (file)
--- a/net/netfilter/xt_mac.c
+++ b/net/netfilter/xt_mac.c
@@ -14,6 +14,7 @@
 #include <linux/etherdevice.h>
 
 #include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
 #include <linux/netfilter/xt_mac.h>
 #include <linux/netfilter/x_tables.h>
 
@@ -43,42 +44,38 @@ match(const struct sk_buff *skb,
                ^ info->invert));
 }
 
-static struct xt_match mac_match = {
-       .name           = "mac",
-       .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 struct xt_match mac6_match = {
-       .name           = "mac",
-       .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 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_IP6_PRE_ROUTING) |
+                                 (1 << NF_IP6_LOCAL_IN) |
+                                 (1 << NF_IP6_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);