Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87a50699 authored by David S. Miller's avatar David S. Miller
Browse files

rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo(). 



Nobody provides non-zero values any longer.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e12939a

include/linux/rtnetlink.h

+1 −2
Original line number Diff line number Diff line
@@ -619,8 +619,7 @@ extern void rtnl_notify(struct sk_buff *skb, struct net *net, u32 pid, 
extern void rtnl_set_sk_err(struct net *net, u32 group, int error);

extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);

extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst,

			      u32 id, u32 ts, u32 tsage, long expires,

			      u32 error);

			      u32 id, long expires, u32 error);



extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change);

net/core/rtnetlink.c

+1 −3
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ nla_put_failure: 
EXPORT_SYMBOL(rtnetlink_put_metrics);



int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id,

		       u32 ts, u32 tsage, long expires, u32 error)

		       long expires, u32 error)

{

	struct rta_cacheinfo ci = {

		.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, 
		.rta_clntref = atomic_read(&(dst->__refcnt)),

		.rta_error = error,

		.rta_id =  id,

		.rta_ts = ts,

		.rta_tsage = tsage,

	};



	if (expires)

net/decnet/dn_route.c

+1 −1
Original line number Diff line number Diff line
@@ -1590,7 +1590,7 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, 
		goto errout;



	expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;

	if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, expires,

	if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires,

			       rt->dst.error) < 0)

		goto errout;

net/ipv4/route.c

+1 −2
Original line number Diff line number Diff line
@@ -2931,8 +2931,7 @@ static int rt_fill_info(struct net *net, 
				goto nla_put_failure;

	}



	if (rtnl_put_cacheinfo(skb, &rt->dst, id, 0, 0,

			       expires, error) < 0)

	if (rtnl_put_cacheinfo(skb, &rt->dst, id, expires, error) < 0)

		goto nla_put_failure;



	return nlmsg_end(skb, nlh);

net/ipv6/route.c

+1 −2
Original line number Diff line number Diff line
@@ -2471,8 +2471,7 @@ static int rt6_fill_node(struct net *net, 
	else

		expires = INT_MAX;



	if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0,

			       expires, rt->dst.error) < 0)

	if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, rt->dst.error) < 0)

		goto nla_put_failure;



	return nlmsg_end(skb, nlh);