aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/fib_rules.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-27 15:57:39 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-27 15:57:39 -0400
commitbb611874650cff942a7466b456a791e8bfa641e7 (patch)
tree32e048e3240dd808e7787ff2b7eb50ed9f0a6182 /net/core/fib_rules.c
parentd328bc839eac685cdd91f5d9d8ad95c070252038 (diff)
parentcb6a4e461fb427689920472bd7335f926d521747 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
Diffstat (limited to 'net/core/fib_rules.c')
-rw-r--r--net/core/fib_rules.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 1bc66592453c..42e84e08a1be 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -122,7 +122,7 @@ errout:
122} 122}
123 123
124struct fib_rules_ops * 124struct fib_rules_ops *
125fib_rules_register(struct fib_rules_ops *tmpl, struct net *net) 125fib_rules_register(const struct fib_rules_ops *tmpl, struct net *net)
126{ 126{
127 struct fib_rules_ops *ops; 127 struct fib_rules_ops *ops;
128 int err; 128 int err;