X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv6%2Fnetfilter%2Fip6t_hl.c;fp=net%2Fipv6%2Fnetfilter%2Fip6t_hl.c;h=c5d9079f2d9dfc885f764f4984b5e9e8deb8d8b4;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=44a729e17c4857e0d2bb7ad3209aeb07c47ec54f;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/ipv6/netfilter/ip6t_hl.c b/net/ipv6/netfilter/ip6t_hl.c
index 44a729e17..c5d9079f2 100644
--- a/net/ipv6/netfilter/ip6t_hl.c
+++ b/net/ipv6/netfilter/ip6t_hl.c
@@ -18,10 +18,10 @@ MODULE_AUTHOR("Maciej Soltysiak <solt@dns.toxicfilms.tv>");
 MODULE_DESCRIPTION("IP tables Hop Limit matching module");
 MODULE_LICENSE("GPL");
 
-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 int match(const struct sk_buff *skb, const struct net_device *in,
+		 const struct net_device *out, const void *matchinfo,
+		 int offset, unsigned int protoff,
+		 int *hotdrop)
 {
 	const struct ip6t_hl_info *info = matchinfo;
 	const struct ipv6hdr *ip6h = skb->nh.ipv6h;
@@ -48,23 +48,33 @@ static int match(const struct sk_buff *skb,
 	return 0;
 }
 
+static int checkentry(const char *tablename, const void *entry,
+		      void *matchinfo, unsigned int matchsize,
+		      unsigned int hook_mask)
+{
+	if (matchsize != IP6T_ALIGN(sizeof(struct ip6t_hl_info)))
+		return 0;
+
+	return 1;
+}
+
 static struct ip6t_match hl_match = {
 	.name		= "hl",
-	.match		= match,
-	.matchsize	= sizeof(struct ip6t_hl_info),
+	.match		= &match,
+	.checkentry	= &checkentry,
 	.me		= THIS_MODULE,
 };
 
-static int __init ip6t_hl_init(void)
+static int __init init(void)
 {
 	return ip6t_register_match(&hl_match);
 }
 
-static void __exit ip6t_hl_fini(void)
+static void __exit fini(void)
 {
 	ip6t_unregister_match(&hl_match);
 
 }
 
-module_init(ip6t_hl_init);
-module_exit(ip6t_hl_fini);
+module_init(init);
+module_exit(fini);