1 files changed, 2 insertions, 20 deletions

diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 7466c546f286..48fdf10be7a1 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -196,7 +196,6 @@ static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
 {
         struct dn_fib_rule *r = (struct dn_fib_rule *)rule;
 
-        frh->family = AF_DECnet;
         frh->dst_len = r->dst_len;
         frh->src_len = r->src_len;
         frh->tos = 0;
@@ -212,29 +211,12 @@ nla_put_failure:
         return -ENOBUFS;
 }
 
-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_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;
-                }
-        }
-
-        return 0;
-}
-
 static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops)
 {
         dn_rt_cache_flush(-1);
 }
 
-static struct fib_rules_ops dn_fib_rules_ops_template = {
+static const struct fib_rules_ops __net_initdata dn_fib_rules_ops_template = {
         .family         = AF_DECnet,
         .rule_size      = sizeof(struct dn_fib_rule),
         .addr_size      = sizeof(u16),
@@ -243,7 +225,7 @@ static struct fib_rules_ops dn_fib_rules_ops_template = {
         .configure      = dn_fib_rule_configure,
         .compare        = dn_fib_rule_compare,
         .fill           = dn_fib_rule_fill,
-        .default_pref   = dn_fib_rule_default_pref,
+        .default_pref   = fib_default_rule_pref,
         .flush_cache    = dn_fib_rule_flush_cache,
         .nlgroup        = RTNLGRP_DECnet_RULE,
         .policy         = dn_fib_rule_policy,