diff options
| author | David S. Miller | 2012-07-13 17:21:29 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-07-13 17:21:29 +0200 |
| commit | 85b91b0339e764f7e56ff5968fa10d85451378b4 (patch) | |
| tree | 539c368948900b35ee8d474829724a796b482d44 /net/ipv4/route.c | |
| parent | tcp: add LAST_ACK as a valid state for TSQ (diff) | |
| download | kernel-qcow2-linux-85b91b0339e764f7e56ff5968fa10d85451378b4.tar.gz kernel-qcow2-linux-85b91b0339e764f7e56ff5968fa10d85451378b4.tar.xz kernel-qcow2-linux-85b91b0339e764f7e56ff5968fa10d85451378b4.zip | |
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/route.c')
| -rw-r--r-- | net/ipv4/route.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 9319bf1f8354..aad21819316d 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1735,7 +1735,7 @@ static void rt_set_nexthop(struct rtable *rt, const struct flowi4 *fl4, #ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_MULTIPLE_TABLES - set_class_tag(rt, fib_rules_tclass(res)); + set_class_tag(rt, res->tclassid); #endif set_class_tag(rt, itag); #endif @@ -2353,11 +2353,9 @@ static struct rtable *ip_route_output_slow(struct net *net, struct flowi4 *fl4) __be32 orig_saddr; int orig_oif; + res.tclassid = 0; res.fi = NULL; res.table = NULL; -#ifdef CONFIG_IP_MULTIPLE_TABLES - res.r = NULL; -#endif orig_daddr = fl4->daddr; orig_saddr = fl4->saddr; |