diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-27 15:57:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-27 15:57:39 -0400 |
commit | bb611874650cff942a7466b456a791e8bfa641e7 (patch) | |
tree | 32e048e3240dd808e7787ff2b7eb50ed9f0a6182 /net/core/fib_rules.c | |
parent | d328bc839eac685cdd91f5d9d8ad95c070252038 (diff) | |
parent | cb6a4e461fb427689920472bd7335f926d521747 (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.c | 2 |
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 | ||
124 | struct fib_rules_ops * | 124 | struct fib_rules_ops * |
125 | fib_rules_register(struct fib_rules_ops *tmpl, struct net *net) | 125 | fib_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; |