diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-13 08:21:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-13 08:21:29 -0700 |
| commit | 85b91b0339e764f7e56ff5968fa10d85451378b4 (patch) | |
| tree | 539c368948900b35ee8d474829724a796b482d44 /net/ipv4/fib_rules.c | |
| parent | d01cb20711e3c2df41677ee270d6bdeff24e9902 (diff) | |
| download | op-kernel-dev-85b91b0339e764f7e56ff5968fa10d85451378b4.zip op-kernel-dev-85b91b0339e764f7e56ff5968fa10d85451378b4.tar.gz | |
ipv4: Don't store a rule pointer in fib_result.
We only use it to fetch the rule's tclassid, so just store the
tclassid there instead.
This also decreases the size of fib_result by a full 8 bytes on
64-bit. On 32-bits it's a wash.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_rules.c')
| -rw-r--r-- | net/ipv4/fib_rules.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index c06da93..a83d74e 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -47,13 +47,6 @@ struct fib4_rule { #endif }; -#ifdef CONFIG_IP_ROUTE_CLASSID -u32 fib_rules_tclass(const struct fib_result *res) -{ - return res->r ? ((struct fib4_rule *) res->r)->tclassid : 0; -} -#endif - int __fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res) { struct fib_lookup_arg arg = { @@ -63,8 +56,12 @@ int __fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res) int err; err = fib_rules_lookup(net->ipv4.rules_ops, flowi4_to_flowi(flp), 0, &arg); - res->r = arg.rule; - +#ifdef CONFIG_IP_ROUTE_CLASSID + if (arg.rule) + res->tclassid = ((struct fib4_rule *)arg.rule)->tclassid; + else + res->tclassid = 0; +#endif return err; } EXPORT_SYMBOL_GPL(__fib_lookup); |
