tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

David S. Miller 87a50699 3e12939a

+5 -10
+1 -2
include/linux/rtnetlink.h
··· 619 619 extern void rtnl_set_sk_err(struct net *net, u32 group, int error); 620 620 extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics); 621 621 extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, 622 - u32 id, u32 ts, u32 tsage, long expires, 623 - u32 error); 622 + u32 id, long expires, u32 error); 624 623 625 624 extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change); 626 625
+1 -3
net/core/rtnetlink.c
··· 615 615 EXPORT_SYMBOL(rtnetlink_put_metrics); 616 616 617 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 620 struct rta_cacheinfo ci = { 621 621 .rta_lastuse = jiffies_to_clock_t(jiffies - dst->lastuse), ··· 623 623 .rta_clntref = atomic_read(&(dst->__refcnt)), 624 624 .rta_error = error, 625 625 .rta_id = id, 626 - .rta_ts = ts, 627 - .rta_tsage = tsage, 628 626 }; 629 627 630 628 if (expires)
+1 -1
net/decnet/dn_route.c
··· 1590 1590 goto errout; 1591 1591 1592 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 1594 rt->dst.error) < 0) 1595 1595 goto errout; 1596 1596
+1 -2
net/ipv4/route.c
··· 2931 2931 goto nla_put_failure; 2932 2932 } 2933 2933 2934 - if (rtnl_put_cacheinfo(skb, &rt->dst, id, 0, 0, 2935 - expires, error) < 0) 2934 + if (rtnl_put_cacheinfo(skb, &rt->dst, id, expires, error) < 0) 2936 2935 goto nla_put_failure; 2937 2936 2938 2937 return nlmsg_end(skb, nlh);
+1 -2
net/ipv6/route.c
··· 2471 2471 else 2472 2472 expires = INT_MAX; 2473 2473 2474 - if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, 2475 - expires, rt->dst.error) < 0) 2474 + if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, rt->dst.error) < 0) 2476 2475 goto nla_put_failure; 2477 2476 2478 2477 return nlmsg_end(skb, nlh);