diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-10 03:14:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-10 22:40:08 -0700 |
| commit | 81166dd6fa8eb780b2132d32fbc77eb6ac04e44e (patch) | |
| tree | 7a41b12950640648d3bb95ca74bfa1391efa0421 /net/ipv6/route.c | |
| parent | 94334d5ed4b64ebcd2c4b421e133b921f8ccf75d (diff) | |
| download | op-kernel-dev-81166dd6fa8eb780b2132d32fbc77eb6ac04e44e.zip op-kernel-dev-81166dd6fa8eb780b2132d32fbc77eb6ac04e44e.tar.gz | |
tcp: Move timestamps from inetpeer to metrics cache.
With help from Lin Ming.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 6cc6c88..0c06847 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2348,13 +2348,11 @@ static int rt6_fill_node(struct net *net, int iif, int type, u32 pid, u32 seq, int prefix, int nowait, unsigned int flags) { - const struct inet_peer *peer; struct rtmsg *rtm; struct nlmsghdr *nlh; long expires; u32 table; struct neighbour *n; - u32 ts, tsage; if (prefix) { /* user wants prefix routes only */ if (!(rt->rt6i_flags & RTF_PREFIX_RT)) { @@ -2473,16 +2471,7 @@ static int rt6_fill_node(struct net *net, else expires = INT_MAX; - peer = NULL; - if (rt6_has_peer(rt)) - peer = rt6_peer_ptr(rt); - ts = tsage = 0; - if (peer && peer->tcp_ts_stamp) { - ts = peer->tcp_ts; - tsage = get_seconds() - peer->tcp_ts_stamp; - } - - if (rtnl_put_cacheinfo(skb, &rt->dst, 0, ts, tsage, + if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, expires, rt->dst.error) < 0) goto nla_put_failure; |
