diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-10 08:06:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-11 01:40:13 -0400 |
commit | 87a50699cb6d169591cc776fb82683a2c77cecac (patch) | |
tree | 1f136f458aa17c46eda75dcc5d0e438429d1dc99 /net | |
parent | 3e12939a2a67fbb4cbd962c3b9bc398c73319766 (diff) |
rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo().
Nobody provides non-zero values any longer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/rtnetlink.c | 4 | ||||
-rw-r--r-- | net/decnet/dn_route.c | 2 | ||||
-rw-r--r-- | net/ipv4/route.c | 3 | ||||
-rw-r--r-- | net/ipv6/route.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 2b325c340b44..64127eee786d 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
@@ -615,7 +615,7 @@ nla_put_failure: | |||
615 | EXPORT_SYMBOL(rtnetlink_put_metrics); | 615 | EXPORT_SYMBOL(rtnetlink_put_metrics); |
616 | 616 | ||
617 | int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, | 617 | int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, |
618 | u32 ts, u32 tsage, long expires, u32 error) | 618 | long expires, u32 error) |
619 | { | 619 | { |
620 | struct rta_cacheinfo ci = { | 620 | struct rta_cacheinfo ci = { |
621 | .rta_lastuse = jiffies_to_clock_t(jiffies - dst->lastuse), | 621 | .rta_lastuse = jiffies_to_clock_t(jiffies - dst->lastuse), |
@@ -623,8 +623,6 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, | |||
623 | .rta_clntref = atomic_read(&(dst->__refcnt)), | 623 | .rta_clntref = atomic_read(&(dst->__refcnt)), |
624 | .rta_error = error, | 624 | .rta_error = error, |
625 | .rta_id = id, | 625 | .rta_id = id, |
626 | .rta_ts = ts, | ||
627 | .rta_tsage = tsage, | ||
628 | }; | 626 | }; |
629 | 627 | ||
630 | if (expires) | 628 | if (expires) |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 707027fae8ab..b5594cc73ee1 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -1590,7 +1590,7 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, | |||
1590 | goto errout; | 1590 | goto errout; |
1591 | 1591 | ||
1592 | expires = rt->dst.expires ? rt->dst.expires - jiffies : 0; | 1592 | expires = rt->dst.expires ? rt->dst.expires - jiffies : 0; |
1593 | if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, expires, | 1593 | if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, |
1594 | rt->dst.error) < 0) | 1594 | rt->dst.error) < 0) |
1595 | goto errout; | 1595 | goto errout; |
1596 | 1596 | ||
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index d4834e2914a0..67b08745daf9 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -2931,8 +2931,7 @@ static int rt_fill_info(struct net *net, | |||
2931 | goto nla_put_failure; | 2931 | goto nla_put_failure; |
2932 | } | 2932 | } |
2933 | 2933 | ||
2934 | if (rtnl_put_cacheinfo(skb, &rt->dst, id, 0, 0, | 2934 | if (rtnl_put_cacheinfo(skb, &rt->dst, id, expires, error) < 0) |
2935 | expires, error) < 0) | ||
2936 | goto nla_put_failure; | 2935 | goto nla_put_failure; |
2937 | 2936 | ||
2938 | return nlmsg_end(skb, nlh); | 2937 | return nlmsg_end(skb, nlh); |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index b7eb51e1a0e1..563f12c1c99c 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -2471,8 +2471,7 @@ static int rt6_fill_node(struct net *net, | |||
2471 | else | 2471 | else |
2472 | expires = INT_MAX; | 2472 | expires = INT_MAX; |
2473 | 2473 | ||
2474 | if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, | 2474 | if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, rt->dst.error) < 0) |
2475 | expires, rt->dst.error) < 0) | ||
2476 | goto nla_put_failure; | 2475 | goto nla_put_failure; |
2477 | 2476 | ||
2478 | return nlmsg_end(skb, nlh); | 2477 | return nlmsg_end(skb, nlh); |