ipv6: Kill rt6i_dev and rt6i_expires defines.

It just obscures that the netdevice pointer and the expires value are
implemented in the dst_entry sub-object of the ipv6 route.

And it makes grepping for dst_entry member uses much harder too.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 85421cce5e1..647e6cba237 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -797,7 +797,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
                                 ip6_del_rt(rt);
                                 rt = NULL;
                         } else if (!(rt->rt6i_flags & RTF_EXPIRES)) {
-                                rt->rt6i_expires = expires;
+                                rt->dst.expires = expires;
                                 rt->rt6i_flags |= RTF_EXPIRES;
                         }
                 }
@@ -1723,7 +1723,7 @@ static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
         if (!fn)
                 goto out;
         for (rt = fn->leaf; rt; rt = rt->dst.rt6_next) {
-                if (rt->rt6i_dev->ifindex != dev->ifindex)
+                if (rt->dst.dev->ifindex != dev->ifindex)
                         continue;
                 if ((rt->rt6i_flags & flags) != flags)
                         continue;
@@ -1881,11 +1881,11 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)
                                 rt = NULL;
                         } else if (addrconf_finite_timeout(rt_expires)) {
                                 /* not infinity */
-                                rt->rt6i_expires = jiffies + rt_expires;
+                                rt->dst.expires = jiffies + rt_expires;
                                 rt->rt6i_flags |= RTF_EXPIRES;
                         } else {
                                 rt->rt6i_flags &= ~RTF_EXPIRES;
-                                rt->rt6i_expires = 0;
+                                rt->dst.expires = 0;
                         }
                 } else if (valid_lft) {
                         clock_t expires = 0;