diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-26 16:02:05 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-26 16:13:54 +0200 |
| commit | 25239cee7e8732dbdc9f5d324f1c22a3bdec1d1f (patch) | |
| tree | c3f36730571a7eb185abcd973b2f4c9616bd8096 /net/ipv4/ipmr.c | |
| parent | 3d0c9c4eb2dbdcc461be4084abd87a9a9e70f713 (diff) | |
| download | linux-stable-25239cee7e8732dbdc9f5d324f1c22a3bdec1d1f.tar.gz linux-stable-25239cee7e8732dbdc9f5d324f1c22a3bdec1d1f.tar.bz2 linux-stable-25239cee7e8732dbdc9f5d324f1c22a3bdec1d1f.zip | |
net: rtnetlink: decouple rtnetlink address families from real address families
Decouple rtnetlink address families from real address families in socket.h to
be able to add rtnetlink interfaces to code that is not a real address family
without increasing AF_MAX/NPROTO.
This will be used to add support for multicast route dumping from all tables
as the proc interface can't be extended to support anything but the main table
without breaking compatibility.
This partialy undoes the patch to introduce independant families for routing
rules and converts ipmr routing rules to a new rtnetlink family. Similar to
that patch, values up to 127 are reserved for real address families, values
above that may be used arbitrarily.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 7d3e382aed64..41e8fc0ce8b3 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -217,7 +217,7 @@ static int ipmr_rule_fill(struct fib_rule *rule, struct sk_buff *skb, } static const struct fib_rules_ops __net_initdata ipmr_rules_ops_template = { - .family = FIB_RULES_IPMR, + .family = RTNL_FAMILY_IPMR, .rule_size = sizeof(struct ipmr_rule), .addr_size = sizeof(u32), .action = ipmr_rule_action, |