summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-27 21:57:39 +0200
committerDavid S. Miller <davem@davemloft.net>2010-04-27 21:57:39 +0200
commitbb611874650cff942a7466b456a791e8bfa641e7 (patch)
tree32e048e3240dd808e7787ff2b7eb50ed9f0a6182 /include/net
parentixgb: Use pr_<level> and netdev_<level> (diff)
parentnet: ipmr: add support for dumping routing tables over netlink (diff)
downloadlinux-bb611874650cff942a7466b456a791e8bfa641e7.tar.xz
linux-bb611874650cff942a7466b456a791e8bfa641e7.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
Diffstat (limited to 'include/net')
-rw-r--r--include/net/fib_rules.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 52bd9e6c9141..e8923bc20f9f 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -104,7 +104,7 @@ static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
return frh->table;
}
-extern struct fib_rules_ops *fib_rules_register(struct fib_rules_ops *, struct net *);
+extern struct fib_rules_ops *fib_rules_register(const struct fib_rules_ops *, struct net *);
extern void fib_rules_unregister(struct fib_rules_ops *);
extern void fib_rules_cleanup_ops(struct fib_rules_ops *);