lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETNS]: Pass fib_rules_ops into default_pref method.

Browse Source 
fib_rules_ops contains operations and the list of configured rules. ops will
become per/namespace soon, so we need them to be known in the default_pref
callback.

Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-01-10 03:18:25 -08:00
committed by David S. Miller
parent f8c26b8d58
commit 868d13ac81
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/fib_rules.h
View File

@@ -56,7 +56,7 @@ struct fib_rules_ops
int (*fill)(struct fib_rule *, struct sk_buff *, int (*fill)(struct fib_rule *, struct sk_buff *,
struct nlmsghdr *, struct nlmsghdr *,
struct fib_rule_hdr *); struct fib_rule_hdr *);
u32 (*default_pref)(void); u32 (*default_pref)(struct fib_rules_ops *ops);
size_t (*nlmsg_payload)(struct fib_rule *); size_t (*nlmsg_payload)(struct fib_rule *);
/* Called after modifications to the rules set, must flush /* Called after modifications to the rules set, must flush

2
net/core/fib_rules.c
View File

@@ -285,7 +285,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
rule->table = frh_get_table(frh, tb); rule->table = frh_get_table(frh, tb);
if (!rule->pref && ops->default_pref) if (!rule->pref && ops->default_pref)
rule->pref = ops->default_pref(); rule->pref = ops->default_pref(ops);
err = -EINVAL; err = -EINVAL;
if (tb[FRA_GOTO]) { if (tb[FRA_GOTO]) {

2
net/decnet/dn_rules.c
View File

@@ -212,7 +212,7 @@ nla_put_failure:
return -ENOBUFS; 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 list_head *pos;
struct fib_rule *rule; struct fib_rule *rule;

2
net/ipv4/fib_rules.c
View File

@@ -245,7 +245,7 @@ nla_put_failure:
return -ENOBUFS; return -ENOBUFS;
} }
static u32 fib4_rule_default_pref(void) static u32 fib4_rule_default_pref(struct fib_rules_ops *ops)
{ {
struct list_head *pos; struct list_head *pos;
struct fib_rule *rule; struct fib_rule *rule;

2
net/ipv6/fib6_rules.c
View File

@@ -223,7 +223,7 @@ nla_put_failure:
return -ENOBUFS; return -ENOBUFS;
} }
static u32 fib6_rule_default_pref(void) static u32 fib6_rule_default_pref(struct fib_rules_ops *ops)
{ {
return 0x3FFF; return 0x3FFF;
} }