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 /include/net | |
| 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 'include/net')
| -rw-r--r-- | include/net/fib_rules.h | 2 |
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) | |||
| 104 | return frh->table; | 104 | return frh->table; |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | extern struct fib_rules_ops *fib_rules_register(struct fib_rules_ops *, struct net *); | 107 | extern struct fib_rules_ops *fib_rules_register(const struct fib_rules_ops *, struct net *); |
| 108 | extern void fib_rules_unregister(struct fib_rules_ops *); | 108 | extern void fib_rules_unregister(struct fib_rules_ops *); |
| 109 | extern void fib_rules_cleanup_ops(struct fib_rules_ops *); | 109 | extern void fib_rules_cleanup_ops(struct fib_rules_ops *); |
| 110 | 110 | ||