[PATCH] autofs4: check for directory re-create in lookup

[linux-2.6-omap-h63xx.git] / net / ipv4 / fib_rules.c

diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 23ec6ae1a0f6903069d1acc4331b2b69b706002d..b837c33e0404fc09a8e54ea7798d8e8b698657af 100644 (file)
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -40,13 +40,10 @@ struct fib4_rule
        u8                      dst_len;
        u8                      src_len;
        u8                      tos;
-       u32                     src;
-       u32                     srcmask;
-       u32                     dst;
-       u32                     dstmask;
-#ifdef CONFIG_IP_ROUTE_FWMARK
-       u32                     fwmark;
-#endif
+       __be32                  src;
+       __be32                  srcmask;
+       __be32                  dst;
+       __be32                  dstmask;
 #ifdef CONFIG_NET_CLS_ROUTE
        u32                     tclassid;
 #endif
@@ -101,8 +98,8 @@ int fib_lookup(struct flowi *flp, struct fib_result *res)
        return err;
 }
 
-int fib4_rule_action(struct fib_rule *rule, struct flowi *flp, int flags,
-                    struct fib_lookup_arg *arg)
+static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp,
+                           int flags, struct fib_lookup_arg *arg)
 {
        int err = -EAGAIN;
        struct fib_table *tbl;
@@ -149,8 +146,8 @@ void fib_select_default(const struct flowi *flp, struct fib_result *res)
 static int fib4_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)
 {
        struct fib4_rule *r = (struct fib4_rule *) rule;
-       u32 daddr = fl->fl4_dst;
-       u32 saddr = fl->fl4_src;
+       __be32 daddr = fl->fl4_dst;
+       __be32 saddr = fl->fl4_src;
 
        if (((saddr ^ r->src) & r->srcmask) ||
            ((daddr ^ r->dst) & r->dstmask))
@@ -159,30 +156,23 @@ static int fib4_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)
        if (r->tos && (r->tos != fl->fl4_tos))
                return 0;
 
-#ifdef CONFIG_IP_ROUTE_FWMARK
-       if (r->fwmark && (r->fwmark != fl->fl4_fwmark))
-               return 0;
-#endif
-
        return 1;
 }
 
 static struct fib_table *fib_empty_table(void)
 {
-       int id;
+       u32 id;
 
        for (id = 1; id <= RT_TABLE_MAX; id++)
-               if (fib_tables[id] == NULL)
-                       return __fib_new_table(id);
+               if (fib_get_table(id) == NULL)
+                       return fib_new_table(id);
        return NULL;
 }
 
 static struct nla_policy fib4_rule_policy[FRA_MAX+1] __read_mostly = {
-       [FRA_IFNAME]    = { .type = NLA_STRING },
-       [FRA_PRIORITY]  = { .type = NLA_U32 },
+       FRA_GENERIC_POLICY,
        [FRA_SRC]       = { .type = NLA_U32 },
        [FRA_DST]       = { .type = NLA_U32 },
-       [FRA_FWMARK]    = { .type = NLA_U32 },
        [FRA_FLOW]      = { .type = NLA_U32 },
 };
 
@@ -212,15 +202,10 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
        }
 
        if (tb[FRA_SRC])
-               rule4->src = nla_get_u32(tb[FRA_SRC]);
+               rule4->src = nla_get_be32(tb[FRA_SRC]);
 
        if (tb[FRA_DST])
-               rule4->dst = nla_get_u32(tb[FRA_DST]);
-
-#ifdef CONFIG_IP_ROUTE_FWMARK
-       if (tb[FRA_FWMARK])
-               rule4->fwmark = nla_get_u32(tb[FRA_FWMARK]);
-#endif
+               rule4->dst = nla_get_be32(tb[FRA_DST]);
 
 #ifdef CONFIG_NET_CLS_ROUTE
        if (tb[FRA_FLOW])
@@ -252,20 +237,15 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
        if (frh->tos && (rule4->tos != frh->tos))
                return 0;
 
-#ifdef CONFIG_IP_ROUTE_FWMARK
-       if (tb[FRA_FWMARK] && (rule4->fwmark != nla_get_u32(tb[FRA_FWMARK])))
-               return 0;
-#endif
-
 #ifdef CONFIG_NET_CLS_ROUTE
        if (tb[FRA_FLOW] && (rule4->tclassid != nla_get_u32(tb[FRA_FLOW])))
                return 0;
 #endif
 
-       if (tb[FRA_SRC] && (rule4->src != nla_get_u32(tb[FRA_SRC])))
+       if (tb[FRA_SRC] && (rule4->src != nla_get_be32(tb[FRA_SRC])))
                return 0;
 
-       if (tb[FRA_DST] && (rule4->dst != nla_get_u32(tb[FRA_DST])))
+       if (tb[FRA_DST] && (rule4->dst != nla_get_be32(tb[FRA_DST])))
                return 0;
 
        return 1;
@@ -281,16 +261,11 @@ static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
        frh->src_len = rule4->src_len;
        frh->tos = rule4->tos;
 
-#ifdef CONFIG_IP_ROUTE_FWMARK
-       if (rule4->fwmark)
-               NLA_PUT_U32(skb, FRA_FWMARK, rule4->fwmark);
-#endif
-
        if (rule4->dst_len)
-               NLA_PUT_U32(skb, FRA_DST, rule4->dst);
+               NLA_PUT_BE32(skb, FRA_DST, rule4->dst);
 
        if (rule4->src_len)
-               NLA_PUT_U32(skb, FRA_SRC, rule4->src);
+               NLA_PUT_BE32(skb, FRA_SRC, rule4->src);
 
 #ifdef CONFIG_NET_CLS_ROUTE
        if (rule4->tclassid)
@@ -324,6 +299,13 @@ static u32 fib4_rule_default_pref(void)
        return 0;
 }
 
+static size_t fib4_rule_nlmsg_payload(struct fib_rule *rule)
+{
+       return nla_total_size(4) /* dst */
+              + nla_total_size(4) /* src */
+              + nla_total_size(4); /* flow */
+}
+
 static struct fib_rules_ops fib4_rules_ops = {
        .family         = AF_INET,
        .rule_size      = sizeof(struct fib4_rule),
@@ -333,6 +315,7 @@ static struct fib_rules_ops fib4_rules_ops = {
        .compare        = fib4_rule_compare,
        .fill           = fib4_rule_fill,
        .default_pref   = fib4_rule_default_pref,
+       .nlmsg_payload  = fib4_rule_nlmsg_payload,
        .nlgroup        = RTNLGRP_IPV4_RULE,
        .policy         = fib4_rule_policy,
        .rules_list     = &fib4_rules,
@@ -347,8 +330,3 @@ void __init fib4_rules_init(void)
 
        fib_rules_register(&fib4_rules_ops);
 }
-
-void __exit fib4_rules_cleanup(void)
-{
-       fib_rules_unregister(&fib4_rules_ops);
-}