diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 19:57:39 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 19:57:39 (GMT) |
| commit | bb611874650cff942a7466b456a791e8bfa641e7 (patch) | |
| tree | 32e048e3240dd808e7787ff2b7eb50ed9f0a6182 /include | |
| parent | d328bc839eac685cdd91f5d9d8ad95c070252038 (diff) | |
| parent | cb6a4e461fb427689920472bd7335f926d521747 (diff) | |
| download | linux-bb611874650cff942a7466b456a791e8bfa641e7.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fib_rules.h | 8 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 6 | ||||
| -rw-r--r-- | include/net/fib_rules.h | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h index 04a3976..51da65b 100644 --- a/include/linux/fib_rules.h +++ b/include/linux/fib_rules.h @@ -15,14 +15,6 @@ /* try to find source address in routing lookups */ #define FIB_RULE_FIND_SADDR 0x00010000 -/* fib_rules families. values up to 127 are reserved for real address - * families, values above 128 may be used arbitrarily. - */ -#define FIB_RULES_IPV4 AF_INET -#define FIB_RULES_IPV6 AF_INET6 -#define FIB_RULES_DECNET AF_DECnet -#define FIB_RULES_IPMR 128 - struct fib_rule_hdr { __u8 family; __u8 dst_len; diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index d1c7c90..5a42c36 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -7,6 +7,12 @@ #include <linux/if_addr.h> #include <linux/neighbour.h> +/* rtnetlink families. Values up to 127 are reserved for real address + * families, values above 128 may be used arbitrarily. + */ +#define RTNL_FAMILY_IPMR 128 +#define RTNL_FAMILY_MAX 128 + /**** * Routing/neighbour discovery messages. ****/ diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index 52bd9e6..e8923bc 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 *); |