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>

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index ea60b0854109b5c1496d6c5564463f345f465ee2..db71c4ad862436ac3bbb04677265bb92024dba7a 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -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);
 

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2b325c340b446c13fbe4ce15991678fc9fe327bd..64127eee786d55e4a69291354cf0d92bdf6ce6cd 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -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)

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 707027fae8abedfca117422db7c710a1b2973f2b..b5594cc73ee14f6b6107abfcb802a1546701f4a2 100644 (file)
--- 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,
                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;
 

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index d4834e2914a0a746fc54bec6dd611b5c3af2ba68..67b08745daf9db8b2e4e3ca82393d6d77a2adfaf 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -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);

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index b7eb51e1a0e1c88ea447354056c1a5de4f3aed47..563f12c1c99cfa4f4ad56d8a805a55805b65974b 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -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);