cfg80211: fix error path in cfg80211_wext_siwscan

[safe/jmp/linux-2.6] / net / netfilter / xt_mark.c

diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index 876bc57..1db07d8 100644 (file)
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -1,10 +1,13 @@
-/* Kernel module to match NFMARK values. */
-
-/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+/*
+ *     xt_mark - Netfilter module to match NFMARK value
+ *
+ *     (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+ *     Copyright © CC Computer Consultants GmbH, 2007 - 2008
+ *     Jan Engelhardt <jengelh@medozas.de>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License version 2 as
+ *     published by the Free Software Foundation.
  */
 
 #include <linux/module.h>
@@ -15,79 +18,36 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
-MODULE_DESCRIPTION("iptables mark matching module");
+MODULE_DESCRIPTION("Xtables: packet mark match");
 MODULE_ALIAS("ipt_mark");
 MODULE_ALIAS("ip6t_mark");
 
-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)
-{
-       const struct xt_mark_info *info = matchinfo;
-
-       return ((skb->nfmark & info->mask) == info->mark) ^ info->invert;
-}
-
-static int
-checkentry(const char *tablename,
-           const void *entry,
-          const struct xt_match *match,
-           void *matchinfo,
-           unsigned int matchsize,
-           unsigned int hook_mask)
+static bool
+mark_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       const struct xt_mark_info *minfo = matchinfo;
+       const struct xt_mark_mtinfo1 *info = par->matchinfo;
 
-       if (minfo->mark > 0xffffffff || minfo->mask > 0xffffffff) {
-               printk(KERN_WARNING "mark: only supports 32bit mark\n");
-               return 0;
-       }
-       return 1;
+       return ((skb->mark & info->mask) == info->mark) ^ info->invert;
 }
 
-static struct xt_match mark_match = {
-       .name           = "mark",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_mark_info),
-       .checkentry     = checkentry,
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match mark6_match = {
-       .name           = "mark",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_mark_info),
-       .checkentry     = checkentry,
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_match mark_mt_reg __read_mostly = {
+       .name           = "mark",
+       .revision       = 1,
+       .family         = NFPROTO_UNSPEC,
+       .match          = mark_mt,
+       .matchsize      = sizeof(struct xt_mark_mtinfo1),
+       .me             = THIS_MODULE,
 };
 
-static int __init xt_mark_init(void)
+static int __init mark_mt_init(void)
 {
-       int ret;
-       ret = xt_register_match(&mark_match);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(&mark6_match);
-       if (ret)
-               xt_unregister_match(&mark_match);
-
-       return ret;
+       return xt_register_match(&mark_mt_reg);
 }
 
-static void __exit xt_mark_fini(void)
+static void __exit mark_mt_exit(void)
 {
-       xt_unregister_match(&mark_match);
-       xt_unregister_match(&mark6_match);
+       xt_unregister_match(&mark_mt_reg);
 }
 
-module_init(xt_mark_init);
-module_exit(xt_mark_fini);
+module_init(mark_mt_init);
+module_exit(mark_mt_exit);