[NETFILTER] xt_policy.c: kill some bloat

[linux-2.6-omap-h63xx.git] / net / netfilter / xt_policy.c

diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c
index 6d6d3b7fcbb5c18b88f8021a8c096debcceffe86..45731ca15b7d55f124c780328766afaea9813d1b 100644 (file)
--- a/net/netfilter/xt_policy.c
+++ b/net/netfilter/xt_policy.c
@@ -33,12 +33,12 @@ xt_addr_cmp(const union xt_policy_addr *a1, const union xt_policy_addr *m,
        return false;
 }
 
-static inline bool
+static bool
 match_xfrm_state(const struct xfrm_state *x, const struct xt_policy_elem *e,
                 unsigned short family)
 {
 #define MATCH_ADDR(x,y,z)      (!e->match.x ||                        \
-                                (xt_addr_cmp(&e->x, &e->y, z, family) \
+                                (xt_addr_cmp(&e->x, &e->y, (z), family) \
                                  ^ e->invert.x))
 #define MATCH(x,y)             (!e->match.x || ((e->x == (y)) ^ e->invert.x))
 
@@ -108,14 +108,11 @@ match_policy_out(const struct sk_buff *skb, const struct xt_policy_info *info,
        return strict ? i == info->len : 0;
 }
 
-static bool 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,
-                 bool *hotdrop)
+static bool
+policy_mt(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,
+          bool *hotdrop)
 {
        const struct xt_policy_info *info = matchinfo;
        int ret;
@@ -133,9 +130,10 @@ static bool match(const struct sk_buff *skb,
        return ret;
 }
 
-static bool checkentry(const char *tablename, const void *ip_void,
-                      const struct xt_match *match,
-                      void *matchinfo, unsigned int hook_mask)
+static bool
+policy_mt_check(const char *tablename, const void *ip_void,
+                const struct xt_match *match, void *matchinfo,
+                unsigned int hook_mask)
 {
        struct xt_policy_info *info = matchinfo;
 
@@ -144,14 +142,13 @@ static bool checkentry(const char *tablename, const void *ip_void,
                                "outgoing policy selected\n");
                return false;
        }
-       /* hook values are equal for IPv4 and IPv6 */
-       if (hook_mask & (1 << NF_IP_PRE_ROUTING | 1 << NF_IP_LOCAL_IN)
+       if (hook_mask & (1 << NF_INET_PRE_ROUTING | 1 << NF_INET_LOCAL_IN)
            && info->flags & XT_POLICY_MATCH_OUT) {
                printk(KERN_ERR "xt_policy: output policy not valid in "
                                "PRE_ROUTING and INPUT\n");
                return false;
        }
-       if (hook_mask & (1 << NF_IP_POST_ROUTING | 1 << NF_IP_LOCAL_OUT)
+       if (hook_mask & (1 << NF_INET_POST_ROUTING | 1 << NF_INET_LOCAL_OUT)
            && info->flags & XT_POLICY_MATCH_IN) {
                printk(KERN_ERR "xt_policy: input policy not valid in "
                                "POST_ROUTING and OUTPUT\n");
@@ -164,37 +161,36 @@ static bool checkentry(const char *tablename, const void *ip_void,
        return true;
 }
 
-static struct xt_match xt_policy_match[] __read_mostly = {
+static struct xt_match policy_mt_reg[] __read_mostly = {
        {
                .name           = "policy",
                .family         = AF_INET,
-               .checkentry     = checkentry,
-               .match          = match,
+               .checkentry     = policy_mt_check,
+               .match          = policy_mt,
                .matchsize      = sizeof(struct xt_policy_info),
                .me             = THIS_MODULE,
        },
        {
                .name           = "policy",
                .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .match          = match,
+               .checkentry     = policy_mt_check,
+               .match          = policy_mt,
                .matchsize      = sizeof(struct xt_policy_info),
                .me             = THIS_MODULE,
        },
 };
 
-static int __init init(void)
+static int __init policy_mt_init(void)
 {
-       return xt_register_matches(xt_policy_match,
-                                  ARRAY_SIZE(xt_policy_match));
+       return xt_register_matches(policy_mt_reg, ARRAY_SIZE(policy_mt_reg));
 }
 
-static void __exit fini(void)
+static void __exit policy_mt_exit(void)
 {
-       xt_unregister_matches(xt_policy_match, ARRAY_SIZE(xt_policy_match));
+       xt_unregister_matches(policy_mt_reg, ARRAY_SIZE(policy_mt_reg));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(policy_mt_init);
+module_exit(policy_mt_exit);
 MODULE_ALIAS("ipt_policy");
 MODULE_ALIAS("ip6t_policy");