Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: fib_rules: consolidate IPv4 and DECnet ->default_pref() functions.

Browse source 
Both functions are equivalent, consolidate them since a following patch
needs a third implementation for multicast routing.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2010-04-13 05:03:15 +00:00 committed by David S. Miller
parent 5611551103
commit d8a566beaa
4 changed files with 21 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/fib_rules.h
View file

@ -114,4 +114,5 @@ extern int fib_rules_lookup(struct fib_rules_ops *,
extern int fib_default_rule_add(struct fib_rules_ops *, extern int fib_default_rule_add(struct fib_rules_ops *,
u32 pref, u32 table, u32 pref, u32 table,
u32 flags); u32 flags);
extern u32 fib_default_rule_pref(struct fib_rules_ops *ops);
#endif #endif

18
net/core/fib_rules.c
View file

@ -39,6 +39,24 @@ int fib_default_rule_add(struct fib_rules_ops *ops,
} }
EXPORT_SYMBOL(fib_default_rule_add); EXPORT_SYMBOL(fib_default_rule_add);
u32 fib_default_rule_pref(struct fib_rules_ops *ops)
{
struct list_head *pos;
struct fib_rule *rule;
if (!list_empty(&ops->rules_list)) {
pos = ops->rules_list.next;
if (pos->next != &ops->rules_list) {
rule = list_entry(pos->next, struct fib_rule, list);
if (rule->pref)
return rule->pref - 1;
}
}
return 0;
}
EXPORT_SYMBOL(fib_default_rule_pref);
static void notify_rule_change(int event, struct fib_rule *rule, static void notify_rule_change(int event, struct fib_rule *rule,
struct fib_rules_ops *ops, struct nlmsghdr *nlh, struct fib_rules_ops *ops, struct nlmsghdr *nlh,
u32 pid); u32 pid);

19
net/decnet/dn_rules.c
View file

@ -212,23 +212,6 @@ static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
return -ENOBUFS; 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) static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops)
{ {
dn_rt_cache_flush(-1); dn_rt_cache_flush(-1);
@ -243,7 +226,7 @@ static struct fib_rules_ops dn_fib_rules_ops_template = {
.configure = dn_fib_rule_configure, .configure = dn_fib_rule_configure,
.compare = dn_fib_rule_compare, .compare = dn_fib_rule_compare,
.fill = dn_fib_rule_fill, .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, .flush_cache = dn_fib_rule_flush_cache,
.nlgroup = RTNLGRP_DECnet_RULE, .nlgroup = RTNLGRP_DECnet_RULE,
.policy = dn_fib_rule_policy, .policy = dn_fib_rule_policy,

19
net/ipv4/fib_rules.c
View file

@ -234,23 +234,6 @@ static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
return -ENOBUFS; return -ENOBUFS;
} }
static u32 fib4_rule_default_pref(struct fib_rules_ops *ops)
{
struct list_head *pos;
struct fib_rule *rule;
if (!list_empty(&ops->rules_list)) {
pos = ops->rules_list.next;
if (pos->next != &ops->rules_list) {
rule = list_entry(pos->next, struct fib_rule, list);
if (rule->pref)
return rule->pref - 1;
}
}
return 0;
}
static size_t fib4_rule_nlmsg_payload(struct fib_rule *rule) static size_t fib4_rule_nlmsg_payload(struct fib_rule *rule)
{ {
return nla_total_size(4) /* dst */ return nla_total_size(4) /* dst */
@ -272,7 +255,7 @@ static struct fib_rules_ops fib4_rules_ops_template = {
.configure = fib4_rule_configure, .configure = fib4_rule_configure,
.compare = fib4_rule_compare, .compare = fib4_rule_compare,
.fill = fib4_rule_fill, .fill = fib4_rule_fill,
.default_pref = fib4_rule_default_pref, .default_pref = fib_default_rule_pref,
.nlmsg_payload = fib4_rule_nlmsg_payload, .nlmsg_payload = fib4_rule_nlmsg_payload,
.flush_cache = fib4_rule_flush_cache, .flush_cache = fib4_rule_flush_cache,
.nlgroup = RTNLGRP_IPV4_RULE, .nlgroup = RTNLGRP_IPV4_RULE,