sysctl: simplify ->strategy

[safe/jmp/linux-2.6] / net / decnet / dn_rules.c

diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 878312f..14fbca5 100644 (file)
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -31,6 +31,7 @@
 #include <net/dn_fib.h>
 #include <net/dn_neigh.h>
 #include <net/dn_dev.h>
+#include <net/dn_route.h>
 
 static struct fib_rules_ops dn_fib_rules_ops;
 
@@ -45,22 +46,8 @@ struct dn_fib_rule
        __le16                  dstmask;
        __le16                  srcmap;
        u8                      flags;
-#ifdef CONFIG_DECNET_ROUTE_FWMARK
-       u32                     fwmark;
-#endif
 };
 
-static struct dn_fib_rule default_rule = {
-       .common = {
-               .refcnt =               ATOMIC_INIT(2),
-               .pref =                 0x7fff,
-               .table =                RT_TABLE_MAIN,
-               .action =               FR_ACT_TO_TBL,
-       },
-};
-
-static LIST_HEAD(dn_fib_rules);
-
 
 int dn_fib_lookup(struct flowi *flp, struct dn_fib_res *res)
 {
@@ -75,8 +62,8 @@ int dn_fib_lookup(struct flowi *flp, struct dn_fib_res *res)
        return err;
 }
 
-int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp, int flags,
-                      struct fib_lookup_arg *arg)
+static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp,
+                             int flags, struct fib_lookup_arg *arg)
 {
        int err = -EAGAIN;
        struct dn_fib_table *tbl;
@@ -110,29 +97,20 @@ errout:
        return err;
 }
 
-static struct nla_policy dn_fib_rule_policy[FRA_MAX+1] __read_mostly = {
-       [FRA_IFNAME]    = { .type = NLA_STRING },
-       [FRA_PRIORITY]  = { .type = NLA_U32 },
-       [FRA_SRC]       = { .type = NLA_U16 },
-       [FRA_DST]       = { .type = NLA_U16 },
-       [FRA_FWMARK]    = { .type = NLA_U32 },
+static const struct nla_policy dn_fib_rule_policy[FRA_MAX+1] = {
+       FRA_GENERIC_POLICY,
 };
 
 static int dn_fib_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)
 {
        struct dn_fib_rule *r = (struct dn_fib_rule *)rule;
-       u16 daddr = fl->fld_dst;
-       u16 saddr = fl->fld_src;
+       __le16 daddr = fl->fld_dst;
+       __le16 saddr = fl->fld_src;
 
        if (((saddr ^ r->src) & r->srcmask) ||
            ((daddr ^ r->dst) & r->dstmask))
                return 0;
 
-#ifdef CONFIG_DECNET_ROUTE_FWMARK
-       if (r->fwmark && (r->fwmark != fl->fld_fwmark))
-               return 0;
-#endif
-
        return 1;
 }
 
@@ -143,7 +121,7 @@ static int dn_fib_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
        int err = -EINVAL;
        struct dn_fib_rule *r = (struct dn_fib_rule *)rule;
 
-       if (frh->src_len > 16 || frh->dst_len > 16 || frh->tos)
+       if (frh->tos)
                goto  errout;
 
        if (rule->table == RT_TABLE_UNSPEC) {
@@ -160,16 +138,11 @@ static int dn_fib_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
                }
        }
 
-       if (tb[FRA_SRC])
-               r->src = nla_get_u16(tb[FRA_SRC]);
-
-       if (tb[FRA_DST])
-               r->dst = nla_get_u16(tb[FRA_DST]);
+       if (frh->src_len)
+               r->src = nla_get_le16(tb[FRA_SRC]);
 
-#ifdef CONFIG_DECNET_ROUTE_FWMARK
-       if (tb[FRA_FWMARK])
-               r->fwmark = nla_get_u32(tb[FRA_FWMARK]);
-#endif
+       if (frh->dst_len)
+               r->dst = nla_get_le16(tb[FRA_DST]);
 
        r->src_len = frh->src_len;
        r->srcmask = dnet_make_mask(r->src_len);
@@ -191,15 +164,10 @@ static int dn_fib_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
        if (frh->dst_len && (r->dst_len != frh->dst_len))
                return 0;
 
-#ifdef CONFIG_DECNET_ROUTE_FWMARK
-       if (tb[FRA_FWMARK] && (r->fwmark != nla_get_u32(tb[FRA_FWMARK])))
-               return 0;
-#endif
-
-       if (tb[FRA_SRC] && (r->src != nla_get_u32(tb[FRA_SRC])))
+       if (frh->src_len && (r->src != nla_get_le16(tb[FRA_SRC])))
                return 0;
 
-       if (tb[FRA_DST] && (r->dst != nla_get_u32(tb[FRA_DST])))
+       if (frh->dst_len && (r->dst != nla_get_le16(tb[FRA_DST])))
                return 0;
 
        return 1;
@@ -233,14 +201,10 @@ static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
        frh->src_len = r->src_len;
        frh->tos = 0;
 
-#ifdef CONFIG_DECNET_ROUTE_FWMARK
-       if (r->fwmark)
-               NLA_PUT_U32(skb, FRA_FWMARK, r->fwmark);
-#endif
        if (r->dst_len)
-               NLA_PUT_U16(skb, FRA_DST, r->dst);
+               NLA_PUT_LE16(skb, FRA_DST, r->dst);
        if (r->src_len)
-               NLA_PUT_U16(skb, FRA_SRC, r->src);
+               NLA_PUT_LE16(skb, FRA_SRC, r->src);
 
        return 0;
 
@@ -248,14 +212,14 @@ nla_put_failure:
        return -ENOBUFS;
 }
 
-static u32 dn_fib_rule_default_pref(void)
+static u32 dn_fib_rule_default_pref(struct fib_rules_ops *ops)
 {
        struct list_head *pos;
        struct fib_rule *rule;
 
-       if (!list_empty(&dn_fib_rules)) {
-               pos = dn_fib_rules.next;
-               if (pos->next != &dn_fib_rules) {
+       if (!list_empty(&dn_fib_rules_ops.rules_list)) {
+               pos = dn_fib_rules_ops.rules_list.next;
+               if (pos->next != &dn_fib_rules_ops.rules_list) {
                        rule = list_entry(pos->next, struct fib_rule, list);
                        if (rule->pref)
                                return rule->pref - 1;
@@ -265,29 +229,33 @@ static u32 dn_fib_rule_default_pref(void)
        return 0;
 }
 
-int dn_fib_dump_rules(struct sk_buff *skb, struct netlink_callback *cb)
+static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops)
 {
-       return fib_rules_dump(skb, cb, AF_DECnet);
+       dn_rt_cache_flush(-1);
 }
 
 static struct fib_rules_ops dn_fib_rules_ops = {
        .family         = AF_DECnet,
        .rule_size      = sizeof(struct dn_fib_rule),
+       .addr_size      = sizeof(u16),
        .action         = dn_fib_rule_action,
        .match          = dn_fib_rule_match,
        .configure      = dn_fib_rule_configure,
        .compare        = dn_fib_rule_compare,
        .fill           = dn_fib_rule_fill,
        .default_pref   = dn_fib_rule_default_pref,
+       .flush_cache    = dn_fib_rule_flush_cache,
        .nlgroup        = RTNLGRP_DECnet_RULE,
        .policy         = dn_fib_rule_policy,
-       .rules_list     = &dn_fib_rules,
+       .rules_list     = LIST_HEAD_INIT(dn_fib_rules_ops.rules_list),
        .owner          = THIS_MODULE,
+       .fro_net        = &init_net,
 };
 
 void __init dn_fib_rules_init(void)
 {
-       list_add_tail(&default_rule.common.list, &dn_fib_rules);
+       BUG_ON(fib_default_rule_add(&dn_fib_rules_ops, 0x7fff,
+                                   RT_TABLE_MAIN, 0));
        fib_rules_register(&dn_fib_rules_ops);
 }