leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Nobody provides non-zero values any longer.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-07-10 05:06:14 -07:00
parent 3e12939a2a
commit 87a50699cb
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/rtnetlink.h
View File

@ -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 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 rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);
extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst,
u32 id, u32 ts, u32 tsage, long expires, u32 id, long expires, u32 error);
u32 error);
extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change); extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change);

4
net/core/rtnetlink.c
View File

@ -615,7 +615,7 @@ nla_put_failure:
EXPORT_SYMBOL(rtnetlink_put_metrics); EXPORT_SYMBOL(rtnetlink_put_metrics);
int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, 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 = { struct rta_cacheinfo ci = {
.rta_lastuse = jiffies_to_clock_t(jiffies - dst->lastuse), .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_clntref = atomic_read(&(dst->__refcnt)),
.rta_error = error, .rta_error = error,
.rta_id = id, .rta_id = id,
.rta_ts = ts,
.rta_tsage = tsage,
}; };
if (expires) if (expires)

2
net/decnet/dn_route.c
View File

@ -1590,7 +1590,7 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
goto errout; goto errout;
expires = rt->dst.expires ? rt->dst.expires - jiffies : 0; 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) rt->dst.error) < 0)
goto errout; goto errout;

3
net/ipv4/route.c
View File

@ -2931,8 +2931,7 @@ static int rt_fill_info(struct net *net,
goto nla_put_failure; goto nla_put_failure;
} }
if (rtnl_put_cacheinfo(skb, &rt->dst, id, 0, 0, if (rtnl_put_cacheinfo(skb, &rt->dst, id, expires, error) < 0)
expires, error) < 0)
goto nla_put_failure; goto nla_put_failure;
return nlmsg_end(skb, nlh); return nlmsg_end(skb, nlh);

3
net/ipv6/route.c
View File

@ -2471,8 +2471,7 @@ static int rt6_fill_node(struct net *net,
else else
expires = INT_MAX; expires = INT_MAX;
if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, rt->dst.error) < 0)
expires, rt->dst.error) < 0)
goto nla_put_failure; goto nla_put_failure;
return nlmsg_end(skb, nlh); return nlmsg_end(skb, nlh);