[NETFILTER]: nfnetlink_log: remove fallback to group 0

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

diff --git a/net/netfilter/xt_dscp.c b/net/netfilter/xt_dscp.c
index 82e250d1f007bf1fa8998bfa15a93b4857566db7..56b247ecc283b7dbc8f546526a80335b24c9dd80 100644 (file)
--- a/net/netfilter/xt_dscp.c
+++ b/net/netfilter/xt_dscp.c
@@ -1,6 +1,4 @@
 /* IP tables module for matching the value of the IPv4/IPv6 DSCP field
- *
- * xt_dscp.c,v 1.3 2002/08/05 19:00:21 laforge Exp
  *
  * (C) 2002 by Harald Welte <laforge@netfilter.org>
  *
@@ -34,7 +32,7 @@ static int match(const struct sk_buff *skb,
                 int *hotdrop)
 {
        const struct xt_dscp_info *info = matchinfo;
-       u_int8_t dscp = ipv4_get_dsfield(skb->nh.iph) >> XT_DSCP_SHIFT;
+       u_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT;
 
        return (dscp == info->dscp) ^ !!info->invert;
 }
@@ -49,7 +47,7 @@ static int match6(const struct sk_buff *skb,
                  int *hotdrop)
 {
        const struct xt_dscp_info *info = matchinfo;
-       u_int8_t dscp = ipv6_get_dsfield(skb->nh.ipv6h) >> XT_DSCP_SHIFT;
+       u_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT;
 
        return (dscp == info->dscp) ^ !!info->invert;
 }
@@ -58,7 +56,6 @@ static int checkentry(const char *tablename,
                      const void *info,
                      const struct xt_match *match,
                      void *matchinfo,
-                     unsigned int matchsize,
                      unsigned int hook_mask)
 {
        const u_int8_t dscp = ((struct xt_dscp_info *)matchinfo)->dscp;
@@ -71,42 +68,33 @@ static int checkentry(const char *tablename,
        return 1;
 }
 
-static struct xt_match dscp_match = {
-       .name           = "dscp",
-       .match          = match,
-       .checkentry     = checkentry,
-       .matchsize      = sizeof(struct xt_dscp_info),
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match dscp6_match = {
-       .name           = "dscp",
-       .match          = match6,
-       .checkentry     = checkentry,
-       .matchsize      = sizeof(struct xt_dscp_info),
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_match xt_dscp_match[] = {
+       {
+               .name           = "dscp",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_dscp_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "dscp",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match6,
+               .matchsize      = sizeof(struct xt_dscp_info),
+               .me             = THIS_MODULE,
+       },
 };
 
 static int __init xt_dscp_match_init(void)
 {
-       int ret;
-       ret = xt_register_match(&dscp_match);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(&dscp6_match);
-       if (ret)
-               xt_unregister_match(&dscp_match);
-
-       return ret;
+       return xt_register_matches(xt_dscp_match, ARRAY_SIZE(xt_dscp_match));
 }
 
 static void __exit xt_dscp_match_fini(void)
 {
-       xt_unregister_match(&dscp_match);
-       xt_unregister_match(&dscp6_match);
+       xt_unregister_matches(xt_dscp_match, ARRAY_SIZE(xt_dscp_match));
 }
 
 module_init(xt_dscp_match_init);