1 files changed, 165 insertions, 144 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index b582a0a0f1c5..4a62c47599b4 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -62,17 +62,6 @@
 #include <linux/sysctl.h>
 #endif
 
-/* Set to 3 to get tracing. */
-#define RT6_DEBUG 2
-
-#if RT6_DEBUG >= 3
-#define RDBG(x) printk x
-#define RT6_TRACE(x...) printk(KERN_DEBUG x)
-#else
-#define RDBG(x)
-#define RT6_TRACE(x...) do { ; } while (0)
-#endif
-
 static struct rt6_info *ip6_rt_copy(const struct rt6_info *ort,
                                     const struct in6_addr *dest);
 static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie);
@@ -134,7 +123,23 @@ static u32 *ipv6_cow_metrics(struct dst_entry *dst, unsigned long old)
 
 static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst, const void *daddr)
 {
-        return __neigh_lookup_errno(&nd_tbl, daddr, dst->dev);
+        struct neighbour *n = __ipv6_neigh_lookup(&nd_tbl, dst->dev, daddr);
+        if (n)
+                return n;
+        return neigh_create(&nd_tbl, daddr, dst->dev);
+}
+
+static int rt6_bind_neighbour(struct rt6_info *rt, struct net_device *dev)
+{
+        struct neighbour *n = __ipv6_neigh_lookup(&nd_tbl, dev, &rt->rt6i_gateway);
+        if (!n) {
+                n = neigh_create(&nd_tbl, &rt->rt6i_gateway, dev);
+                if (IS_ERR(n))
+                        return PTR_ERR(n);
+        }
+        dst_set_neighbour(&rt->dst, n);
+
+        return 0;
 }
 
 static struct dst_ops ip6_dst_ops_template = {
@@ -247,9 +252,9 @@ static inline struct rt6_info *ip6_dst_alloc(struct dst_ops *ops,
 {
         struct rt6_info *rt = dst_alloc(ops, dev, 0, 0, flags);
 
-        if (rt != NULL)
+        if (rt)
                 memset(&rt->rt6i_table, 0,
-                        sizeof(*rt) - sizeof(struct dst_entry));
+                       sizeof(*rt) - sizeof(struct dst_entry));
 
         return rt;
 }
@@ -263,7 +268,7 @@ static void ip6_dst_destroy(struct dst_entry *dst)
         if (!(rt->dst.flags & DST_HOST))
                 dst_destroy_metrics_generic(dst);
 
-        if (idev != NULL) {
+        if (idev) {
                 rt->rt6i_idev = NULL;
                 in6_dev_put(idev);
         }
@@ -299,10 +304,10 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
         struct net_device *loopback_dev =
                 dev_net(dev)->loopback_dev;
 
-        if (dev != loopback_dev && idev != NULL && idev->dev == dev) {
+        if (dev != loopback_dev && idev && idev->dev == dev) {
                 struct inet6_dev *loopback_idev =
                         in6_dev_get(loopback_dev);
-                if (loopback_idev != NULL) {
+                if (loopback_idev) {
                         rt->rt6i_idev = loopback_idev;
                         in6_dev_put(idev);
                 }
@@ -312,7 +317,7 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
 static __inline__ int rt6_check_expired(const struct rt6_info *rt)
 {
         return (rt->rt6i_flags & RTF_EXPIRES) &&
-                time_after(jiffies, rt->rt6i_expires);
+                time_after(jiffies, rt->dst.expires);
 }
 
 static inline int rt6_need_strict(const struct in6_addr *daddr)
@@ -338,13 +343,13 @@ static inline struct rt6_info *rt6_device_match(struct net *net,
                 goto out;
 
         for (sprt = rt; sprt; sprt = sprt->dst.rt6_next) {
-                struct net_device *dev = sprt->rt6i_dev;
+                struct net_device *dev = sprt->dst.dev;
 
                 if (oif) {
                         if (dev->ifindex == oif)
                                 return sprt;
                         if (dev->flags & IFF_LOOPBACK) {
-                                if (sprt->rt6i_idev == NULL ||
+                                if (!sprt->rt6i_idev ||
                                     sprt->rt6i_idev->dev->ifindex != oif) {
                                         if (flags & RT6_LOOKUP_F_IFACE && oif)
                                                 continue;
@@ -385,7 +390,7 @@ static void rt6_probe(struct rt6_info *rt)
          * to no more than one per minute.
          */
         rcu_read_lock();
-        neigh = rt ? dst_get_neighbour(&rt->dst) : NULL;
+        neigh = rt ? dst_get_neighbour_noref(&rt->dst) : NULL;
         if (!neigh || (neigh->nud_state & NUD_VALID))
                 goto out;
         read_lock_bh(&neigh->lock);
@@ -399,7 +404,7 @@ static void rt6_probe(struct rt6_info *rt)
 
                 target = (struct in6_addr *)&neigh->primary_key;
                 addrconf_addr_solict_mult(target, &mcaddr);
-                ndisc_send_ns(rt->rt6i_dev, NULL, target, &mcaddr, NULL);
+                ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL);
         } else {
                 read_unlock_bh(&neigh->lock);
         }
@@ -417,7 +422,7 @@ static inline void rt6_probe(struct rt6_info *rt)
  */
 static inline int rt6_check_dev(struct rt6_info *rt, int oif)
 {
-        struct net_device *dev = rt->rt6i_dev;
+        struct net_device *dev = rt->dst.dev;
         if (!oif || dev->ifindex == oif)
                 return 2;
         if ((dev->flags & IFF_LOOPBACK) &&
@@ -432,7 +437,7 @@ static inline int rt6_check_neigh(struct rt6_info *rt)
         int m;
 
         rcu_read_lock();
-        neigh = dst_get_neighbour(&rt->dst);
+        neigh = dst_get_neighbour_noref(&rt->dst);
         if (rt->rt6i_flags & RTF_NONEXTHOP ||
             !(rt->rt6i_flags & RTF_GATEWAY))
                 m = 1;
@@ -518,9 +523,6 @@ static struct rt6_info *rt6_select(struct fib6_node *fn, int oif, int strict)
         struct rt6_info *match, *rt0;
         struct net *net;
 
-        RT6_TRACE("%s(fn->leaf=%p, oif=%d)\n",
-                  __func__, fn->leaf, oif);
-
         rt0 = fn->rr_ptr;
         if (!rt0)
                 fn->rr_ptr = rt0 = fn->leaf;
@@ -539,10 +541,7 @@ static struct rt6_info *rt6_select(struct fib6_node *fn, int oif, int strict)
                         fn->rr_ptr = next;
         }
 
-        RT6_TRACE("%s() => %p\n",
-                  __func__, match);
-
-        net = dev_net(rt0->rt6i_dev);
+        net = dev_net(rt0->dst.dev);
         return match ? match : net->ipv6.ip6_null_entry;
 }
 
@@ -611,7 +610,7 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,
                 if (!addrconf_finite_timeout(lifetime)) {
                         rt->rt6i_flags &= ~RTF_EXPIRES;
                 } else {
-                        rt->rt6i_expires = jiffies + HZ * lifetime;
+                        rt->dst.expires = jiffies + HZ * lifetime;
                         rt->rt6i_flags |= RTF_EXPIRES;
                 }
                 dst_release(&rt->dst);
@@ -636,7 +635,7 @@ do { \
                                 goto restart; \
                 } \
         } \
-} while(0)
+} while (0)
 
 static struct rt6_info *ip6_pol_route_lookup(struct net *net,
                                              struct fib6_table *table,
@@ -658,6 +657,13 @@ out:
 
 }
 
+struct dst_entry * ip6_route_lookup(struct net *net, struct flowi6 *fl6,
+                                    int flags)
+{
+        return fib6_rule_lookup(net, fl6, flags, ip6_pol_route_lookup);
+}
+EXPORT_SYMBOL_GPL(ip6_route_lookup);
+
 struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,
                             const struct in6_addr *saddr, int oif, int strict)
 {
@@ -706,7 +712,7 @@ static int __ip6_ins_rt(struct rt6_info *rt, struct nl_info *info)
 int ip6_ins_rt(struct rt6_info *rt)
 {
         struct nl_info info = {
-                .nl_net = dev_net(rt->rt6i_dev),
+                .nl_net = dev_net(rt->dst.dev),
         };
         return __ip6_ins_rt(rt, &info);
 }
@@ -724,29 +730,27 @@ static struct rt6_info *rt6_alloc_cow(const struct rt6_info *ort,
         rt = ip6_rt_copy(ort, daddr);
 
         if (rt) {
-                struct neighbour *neigh;
                 int attempts = !in_softirq();
 
-                if (!(rt->rt6i_flags&RTF_GATEWAY)) {
+                if (!(rt->rt6i_flags & RTF_GATEWAY)) {
                         if (ort->rt6i_dst.plen != 128 &&
                             ipv6_addr_equal(&ort->rt6i_dst.addr, daddr))
                                 rt->rt6i_flags |= RTF_ANYCAST;
-                        ipv6_addr_copy(&rt->rt6i_gateway, daddr);
+                        rt->rt6i_gateway = *daddr;
                 }
 
                 rt->rt6i_flags |= RTF_CACHE;
 
 #ifdef CONFIG_IPV6_SUBTREES
                 if (rt->rt6i_src.plen && saddr) {
-                        ipv6_addr_copy(&rt->rt6i_src.addr, saddr);
+                        rt->rt6i_src.addr = *saddr;
                         rt->rt6i_src.plen = 128;
                 }
 #endif
 
         retry:
-                neigh = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway);
-                if (IS_ERR(neigh)) {
-                        struct net *net = dev_net(rt->rt6i_dev);
+                if (rt6_bind_neighbour(rt, rt->dst.dev)) {
+                        struct net *net = dev_net(rt->dst.dev);
                         int saved_rt_min_interval =
                                 net->ipv6.sysctl.ip6_rt_gc_min_interval;
                         int saved_rt_elasticity =
@@ -771,8 +775,6 @@ static struct rt6_info *rt6_alloc_cow(const struct rt6_info *ort,
                         dst_free(&rt->dst);
                         return NULL;
                 }
-                dst_set_neighbour(&rt->dst, neigh);
-
         }
 
         return rt;
@@ -785,7 +787,7 @@ static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort,
 
         if (rt) {
                 rt->rt6i_flags |= RTF_CACHE;
-                dst_set_neighbour(&rt->dst, neigh_clone(dst_get_neighbour_raw(&ort->dst)));
+                dst_set_neighbour(&rt->dst, neigh_clone(dst_get_neighbour_noref_raw(&ort->dst)));
         }
         return rt;
 }
@@ -819,7 +821,7 @@ restart:
         dst_hold(&rt->dst);
         read_unlock_bh(&table->tb6_lock);
 
-        if (!dst_get_neighbour_raw(&rt->dst) && !(rt->rt6i_flags & RTF_NONEXTHOP))
+        if (!dst_get_neighbour_noref_raw(&rt->dst) && !(rt->rt6i_flags & RTF_NONEXTHOP))
                 nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr);
         else if (!(rt->dst.flags & DST_HOST))
                 nrt = rt6_alloc_clone(rt, &fl6->daddr);
@@ -875,7 +877,7 @@ void ip6_route_input(struct sk_buff *skb)
                 .flowi6_iif = skb->dev->ifindex,
                 .daddr = iph->daddr,
                 .saddr = iph->saddr,
-                .flowlabel = (* (__be32 *) iph)&IPV6_FLOWINFO_MASK,
+                .flowlabel = (* (__be32 *) iph) & IPV6_FLOWINFO_MASK,
                 .flowi6_mark = skb->mark,
                 .flowi6_proto = iph->nexthdr,
         };
@@ -932,9 +934,9 @@ struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_ori
                 rt->rt6i_idev = ort->rt6i_idev;
                 if (rt->rt6i_idev)
                         in6_dev_hold(rt->rt6i_idev);
-                rt->rt6i_expires = 0;
+                rt->dst.expires = 0;
 
-                ipv6_addr_copy(&rt->rt6i_gateway, &ort->rt6i_gateway);
+                rt->rt6i_gateway = ort->rt6i_gateway;
                 rt->rt6i_flags = ort->rt6i_flags & ~RTF_EXPIRES;
                 rt->rt6i_metric = 0;
 
@@ -997,7 +999,7 @@ static void ip6_link_failure(struct sk_buff *skb)
 
         rt = (struct rt6_info *) skb_dst(skb);
         if (rt) {
-                if (rt->rt6i_flags&RTF_CACHE) {
+                if (rt->rt6i_flags & RTF_CACHE) {
                         dst_set_expires(&rt->dst, 0);
                         rt->rt6i_flags |= RTF_EXPIRES;
                 } else if (rt->rt6i_node && (rt->rt6i_flags & RTF_DEFAULT))
@@ -1067,34 +1069,38 @@ static DEFINE_SPINLOCK(icmp6_dst_lock);
 
 struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
                                   struct neighbour *neigh,
-                                  const struct in6_addr *addr)
+                                  struct flowi6 *fl6)
 {
+        struct dst_entry *dst;
         struct rt6_info *rt;
         struct inet6_dev *idev = in6_dev_get(dev);
         struct net *net = dev_net(dev);
 
-        if (unlikely(idev == NULL))
+        if (unlikely(!idev))
                 return NULL;
 
         rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, dev, 0);
-        if (unlikely(rt == NULL)) {
+        if (unlikely(!rt)) {
                 in6_dev_put(idev);
+                dst = ERR_PTR(-ENOMEM);
                 goto out;
         }
 
         if (neigh)
                 neigh_hold(neigh);
         else {
-                neigh = ndisc_get_neigh(dev, addr);
-                if (IS_ERR(neigh))
-                        neigh = NULL;
+                neigh = ip6_neigh_lookup(&rt->dst, &fl6->daddr);
+                if (IS_ERR(neigh)) {
+                        dst_free(&rt->dst);
+                        return ERR_CAST(neigh);
+                }
         }
 
         rt->dst.flags |= DST_HOST;
         rt->dst.output  = ip6_output;
         dst_set_neighbour(&rt->dst, neigh);
         atomic_set(&rt->dst.__refcnt, 1);
-        ipv6_addr_copy(&rt->rt6i_dst.addr, addr);
+        rt->rt6i_dst.addr = fl6->daddr;
         rt->rt6i_dst.plen = 128;
         rt->rt6i_idev     = idev;
         dst_metric_set(&rt->dst, RTAX_HOPLIMIT, 255);
@@ -1106,8 +1112,10 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
 
         fib6_force_start_gc(net);
 
+        dst = xfrm_lookup(net, &rt->dst, flowi6_to_flowi(fl6), NULL, 0);
+
 out:
-        return &rt->dst;
+        return dst;
 }
 
 int icmp6_dst_gc(void)
@@ -1237,21 +1245,30 @@ int ip6_route_add(struct fib6_config *cfg)
         if (cfg->fc_metric == 0)
                 cfg->fc_metric = IP6_RT_PRIO_USER;
 
-        table = fib6_new_table(net, cfg->fc_table);
-        if (table == NULL) {
-                err = -ENOBUFS;
-                goto out;
+        err = -ENOBUFS;
+        if (cfg->fc_nlinfo.nlh &&
+            !(cfg->fc_nlinfo.nlh->nlmsg_flags & NLM_F_CREATE)) {
+                table = fib6_get_table(net, cfg->fc_table);
+                if (!table) {
+                        printk(KERN_WARNING "IPv6: NLM_F_CREATE should be specified when creating new route\n");
+                        table = fib6_new_table(net, cfg->fc_table);
+                }
+        } else {
+                table = fib6_new_table(net, cfg->fc_table);
         }
 
+        if (!table)
+                goto out;
+
         rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, NULL, DST_NOCOUNT);
 
-        if (rt == NULL) {
+        if (!rt) {
                 err = -ENOMEM;
                 goto out;
         }
 
         rt->dst.obsolete = -1;
-        rt->rt6i_expires = (cfg->fc_flags & RTF_EXPIRES) ?
+        rt->dst.expires = (cfg->fc_flags & RTF_EXPIRES) ?
                                 jiffies + clock_t_to_jiffies(cfg->fc_expires) :
                                 0;
 
@@ -1294,8 +1311,9 @@ int ip6_route_add(struct fib6_config *cfg)
            they would result in kernel looping; promote them to reject routes
          */
         if ((cfg->fc_flags & RTF_REJECT) ||
-            (dev && (dev->flags&IFF_LOOPBACK) && !(addr_type&IPV6_ADDR_LOOPBACK)
-                                              && !(cfg->fc_flags&RTF_LOCAL))) {
+            (dev && (dev->flags & IFF_LOOPBACK) &&
+             !(addr_type & IPV6_ADDR_LOOPBACK) &&
+             !(cfg->fc_flags & RTF_LOCAL))) {
                 /* hold loopback dev/idev if we haven't done so. */
                 if (dev != net->loopback_dev) {
                         if (dev) {
@@ -1322,7 +1340,7 @@ int ip6_route_add(struct fib6_config *cfg)
                 int gwa_type;
 
                 gw_addr = &cfg->fc_gateway;
-                ipv6_addr_copy(&rt->rt6i_gateway, gw_addr);
+                rt->rt6i_gateway = *gw_addr;
                 gwa_type = ipv6_addr_type(gw_addr);
 
                 if (gwa_type != (IPV6_ADDR_LINKLOCAL|IPV6_ADDR_UNICAST)) {
@@ -1336,26 +1354,26 @@ int ip6_route_add(struct fib6_config *cfg)
                            some exceptions. --ANK
                          */
                         err = -EINVAL;
-                        if (!(gwa_type&IPV6_ADDR_UNICAST))
+                        if (!(gwa_type & IPV6_ADDR_UNICAST))
                                 goto out;
 
                         grt = rt6_lookup(net, gw_addr, NULL, cfg->fc_ifindex, 1);
 
                         err = -EHOSTUNREACH;
-                        if (grt == NULL)
+                        if (!grt)
                                 goto out;
                         if (dev) {
-                                if (dev != grt->rt6i_dev) {
+                                if (dev != grt->dst.dev) {
                                         dst_release(&grt->dst);
                                         goto out;
                                 }
                         } else {
-                                dev = grt->rt6i_dev;
+                                dev = grt->dst.dev;
                                 idev = grt->rt6i_idev;
                                 dev_hold(dev);
                                 in6_dev_hold(grt->rt6i_idev);
                         }
-                        if (!(grt->rt6i_flags&RTF_GATEWAY))
+                        if (!(grt->rt6i_flags & RTF_GATEWAY))
                                 err = 0;
                         dst_release(&grt->dst);
 
@@ -1363,12 +1381,12 @@ int ip6_route_add(struct fib6_config *cfg)
                                 goto out;
                 }
                 err = -EINVAL;
-                if (dev == NULL || (dev->flags&IFF_LOOPBACK))
+                if (!dev || (dev->flags & IFF_LOOPBACK))
                         goto out;
         }
 
         err = -ENODEV;
-        if (dev == NULL)
+        if (!dev)
                 goto out;
 
         if (!ipv6_addr_any(&cfg->fc_prefsrc)) {
@@ -1376,18 +1394,15 @@ int ip6_route_add(struct fib6_config *cfg)
                         err = -EINVAL;
                         goto out;
                 }
-                ipv6_addr_copy(&rt->rt6i_prefsrc.addr, &cfg->fc_prefsrc);
+                rt->rt6i_prefsrc.addr = cfg->fc_prefsrc;
                 rt->rt6i_prefsrc.plen = 128;
         } else
                 rt->rt6i_prefsrc.plen = 0;
 
         if (cfg->fc_flags & (RTF_GATEWAY | RTF_NONEXTHOP)) {
-                struct neighbour *n = __neigh_lookup_errno(&nd_tbl, &rt->rt6i_gateway, dev);
-                if (IS_ERR(n)) {
-                        err = PTR_ERR(n);
+                err = rt6_bind_neighbour(rt, dev);
+                if (err)
                         goto out;
-                }
-                dst_set_neighbour(&rt->dst, n);
         }
 
         rt->rt6i_flags = cfg->fc_flags;
@@ -1433,7 +1448,7 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info)
 {
         int err;
         struct fib6_table *table;
-        struct net *net = dev_net(rt->rt6i_dev);
+        struct net *net = dev_net(rt->dst.dev);
 
         if (rt == net->ipv6.ip6_null_entry)
                 return -ENOENT;
@@ -1452,7 +1467,7 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info)
 int ip6_del_rt(struct rt6_info *rt)
 {
         struct nl_info info = {
-                .nl_net = dev_net(rt->rt6i_dev),
+                .nl_net = dev_net(rt->dst.dev),
         };
         return __ip6_del_rt(rt, &info);
 }
@@ -1465,7 +1480,7 @@ static int ip6_route_del(struct fib6_config *cfg)
         int err = -ESRCH;
 
         table = fib6_get_table(cfg->fc_nlinfo.nl_net, cfg->fc_table);
-        if (table == NULL)
+        if (!table)
                 return err;
 
         read_lock_bh(&table->tb6_lock);
@@ -1477,8 +1492,8 @@ static int ip6_route_del(struct fib6_config *cfg)
         if (fn) {
                 for (rt = fn->leaf; rt; rt = rt->dst.rt6_next) {
                         if (cfg->fc_ifindex &&
-                            (rt->rt6i_dev == NULL ||
-                             rt->rt6i_dev->ifindex != cfg->fc_ifindex))
+                            (!rt->dst.dev ||
+                             rt->dst.dev->ifindex != cfg->fc_ifindex))
                                 continue;
                         if (cfg->fc_flags & RTF_GATEWAY &&
                             !ipv6_addr_equal(&cfg->fc_gateway, &rt->rt6i_gateway))
@@ -1540,7 +1555,7 @@ restart:
                         continue;
                 if (!(rt->rt6i_flags & RTF_GATEWAY))
                         continue;
-                if (fl6->flowi6_oif != rt->rt6i_dev->ifindex)
+                if (fl6->flowi6_oif != rt->dst.dev->ifindex)
                         continue;
                 if (!ipv6_addr_equal(&rdfl->gateway, &rt->rt6i_gateway))
                         continue;
@@ -1573,7 +1588,7 @@ static struct rt6_info *ip6_route_redirect(const struct in6_addr *dest,
                 },
         };
 
-        ipv6_addr_copy(&rdfl.gateway, gateway);
+        rdfl.gateway = *gateway;
 
         if (rt6_need_strict(dest))
                 flags |= RT6_LOOKUP_F_IFACE;
@@ -1618,18 +1633,18 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src,
         dst_confirm(&rt->dst);
 
         /* Duplicate redirect: silently ignore. */
-        if (neigh == dst_get_neighbour_raw(&rt->dst))
+        if (neigh == dst_get_neighbour_noref_raw(&rt->dst))
                 goto out;
 
         nrt = ip6_rt_copy(rt, dest);
-        if (nrt == NULL)
+        if (!nrt)
                 goto out;
 
         nrt->rt6i_flags = RTF_GATEWAY|RTF_UP|RTF_DYNAMIC|RTF_CACHE;
         if (on_link)
                 nrt->rt6i_flags &= ~RTF_GATEWAY;
 
-        ipv6_addr_copy(&nrt->rt6i_gateway, (struct in6_addr*)neigh->primary_key);
+        nrt->rt6i_gateway = *(struct in6_addr *)neigh->primary_key;
         dst_set_neighbour(&nrt->dst, neigh_clone(neigh));
 
         if (ip6_ins_rt(nrt))
@@ -1639,7 +1654,7 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src,
         netevent.new = &nrt->dst;
         call_netevent_notifiers(NETEVENT_REDIRECT, &netevent);
 
-        if (rt->rt6i_flags&RTF_CACHE) {
+        if (rt->rt6i_flags & RTF_CACHE) {
                 ip6_del_rt(rt);
                 return;
         }
@@ -1660,7 +1675,7 @@ static void rt6_do_pmtu_disc(const struct in6_addr *daddr, const struct in6_addr
         int allfrag = 0;
 again:
         rt = rt6_lookup(net, daddr, saddr, ifindex, 0);
-        if (rt == NULL)
+        if (!rt)
                 return;
 
         if (rt6_check_expired(rt)) {
@@ -1710,7 +1725,7 @@ again:
            1. It is connected route. Action: COW
            2. It is gatewayed route or NONEXTHOP route. Action: clone it.
          */
-        if (!dst_get_neighbour_raw(&rt->dst) && !(rt->rt6i_flags & RTF_NONEXTHOP))
+        if (!dst_get_neighbour_noref_raw(&rt->dst) && !(rt->rt6i_flags & RTF_NONEXTHOP))
                 nrt = rt6_alloc_cow(rt, daddr, saddr);
         else
                 nrt = rt6_alloc_clone(rt, daddr);
@@ -1766,7 +1781,7 @@ void rt6_pmtu_discovery(const struct in6_addr *daddr, const struct in6_addr *sad
 static struct rt6_info *ip6_rt_copy(const struct rt6_info *ort,
                                     const struct in6_addr *dest)
 {
-        struct net *net = dev_net(ort->rt6i_dev);
+        struct net *net = dev_net(ort->dst.dev);
         struct rt6_info *rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops,
                                             ort->dst.dev, 0);
 
@@ -1775,7 +1790,7 @@ static struct rt6_info *ip6_rt_copy(const struct rt6_info *ort,
                 rt->dst.output = ort->dst.output;
                 rt->dst.flags |= DST_HOST;
 
-                ipv6_addr_copy(&rt->rt6i_dst.addr, dest);
+                rt->rt6i_dst.addr = *dest;
                 rt->rt6i_dst.plen = 128;
                 dst_copy_metrics(&rt->dst, &ort->dst);
                 rt->dst.error = ort->dst.error;
@@ -1783,9 +1798,9 @@ static struct rt6_info *ip6_rt_copy(const struct rt6_info *ort,
                 if (rt->rt6i_idev)
                         in6_dev_hold(rt->rt6i_idev);
                 rt->dst.lastuse = jiffies;
-                rt->rt6i_expires = 0;
+                rt->dst.expires = 0;
 
-                ipv6_addr_copy(&rt->rt6i_gateway, &ort->rt6i_gateway);
+                rt->rt6i_gateway = ort->rt6i_gateway;
                 rt->rt6i_flags = ort->rt6i_flags & ~RTF_EXPIRES;
                 rt->rt6i_metric = 0;
 
@@ -1808,7 +1823,7 @@ static struct rt6_info *rt6_get_route_info(struct net *net,
         struct fib6_table *table;
 
         table = fib6_get_table(net, RT6_TABLE_INFO);
-        if (table == NULL)
+        if (!table)
                 return NULL;
 
         write_lock_bh(&table->tb6_lock);
@@ -1817,7 +1832,7 @@ static struct rt6_info *rt6_get_route_info(struct net *net,
                 goto out;
 
         for (rt = fn->leaf; rt; rt = rt->dst.rt6_next) {
-                if (rt->rt6i_dev->ifindex != ifindex)
+                if (rt->dst.dev->ifindex != ifindex)
                         continue;
                 if ((rt->rt6i_flags & (RTF_ROUTEINFO|RTF_GATEWAY)) != (RTF_ROUTEINFO|RTF_GATEWAY))
                         continue;
@@ -1848,8 +1863,8 @@ static struct rt6_info *rt6_add_route_info(struct net *net,
                 .fc_nlinfo.nl_net = net,
         };
 
-        ipv6_addr_copy(&cfg.fc_dst, prefix);
-        ipv6_addr_copy(&cfg.fc_gateway, gwaddr);
+        cfg.fc_dst = *prefix;
+        cfg.fc_gateway = *gwaddr;
 
         /* We should treat it as a default route if prefix length is 0. */
         if (!prefixlen)
@@ -1867,12 +1882,12 @@ struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_dev
         struct fib6_table *table;
 
         table = fib6_get_table(dev_net(dev), RT6_TABLE_DFLT);
-        if (table == NULL)
+        if (!table)
                 return NULL;
 
         write_lock_bh(&table->tb6_lock);
         for (rt = table->tb6_root.leaf; rt; rt=rt->dst.rt6_next) {
-                if (dev == rt->rt6i_dev &&
+                if (dev == rt->dst.dev &&
                     ((rt->rt6i_flags & (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) &&
                     ipv6_addr_equal(&rt->rt6i_gateway, addr))
                         break;
@@ -1898,7 +1913,7 @@ struct rt6_info *rt6_add_dflt_router(const struct in6_addr *gwaddr,
                 .fc_nlinfo.nl_net = dev_net(dev),
         };
 
-        ipv6_addr_copy(&cfg.fc_gateway, gwaddr);
+        cfg.fc_gateway = *gwaddr;
 
         ip6_route_add(&cfg);
 
@@ -1912,7 +1927,7 @@ void rt6_purge_dflt_routers(struct net *net)
 
         /* NOTE: Keep consistent with rt6_get_dflt_router */
         table = fib6_get_table(net, RT6_TABLE_DFLT);
-        if (table == NULL)
+        if (!table)
                 return;
 
 restart:
@@ -1944,9 +1959,9 @@ static void rtmsg_to_fib6_config(struct net *net,
 
         cfg->fc_nlinfo.nl_net = net;
 
-        ipv6_addr_copy(&cfg->fc_dst, &rtmsg->rtmsg_dst);
-        ipv6_addr_copy(&cfg->fc_src, &rtmsg->rtmsg_src);
-        ipv6_addr_copy(&cfg->fc_gateway, &rtmsg->rtmsg_gateway);
+        cfg->fc_dst = rtmsg->rtmsg_dst;
+        cfg->fc_src = rtmsg->rtmsg_src;
+        cfg->fc_gateway = rtmsg->rtmsg_gateway;
 }
 
 int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg)
@@ -2045,14 +2060,14 @@ static int ip6_pkt_prohibit_out(struct sk_buff *skb)
 
 struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
                                     const struct in6_addr *addr,
-                                    int anycast)
+                                    bool anycast)
 {
         struct net *net = dev_net(idev->dev);
         struct rt6_info *rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops,
                                             net->loopback_dev, 0);
-        struct neighbour *neigh;
+        int err;
 
-        if (rt == NULL) {
+        if (!rt) {
                 if (net_ratelimit())
                         pr_warning("IPv6:  Maximum number of routes reached,"
                                    " consider increasing route/max_size.\n");
@@ -2072,15 +2087,13 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
                 rt->rt6i_flags |= RTF_ANYCAST;
         else
                 rt->rt6i_flags |= RTF_LOCAL;
-        neigh = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway);
-        if (IS_ERR(neigh)) {
+        err = rt6_bind_neighbour(rt, rt->dst.dev);
+        if (err) {
                 dst_free(&rt->dst);
-
-                return ERR_CAST(neigh);
+                return ERR_PTR(err);
         }
-        dst_set_neighbour(&rt->dst, neigh);
 
-        ipv6_addr_copy(&rt->rt6i_dst.addr, addr);
+        rt->rt6i_dst.addr = *addr;
         rt->rt6i_dst.plen = 128;
         rt->rt6i_table = fib6_get_table(net, RT6_TABLE_LOCAL);
 
@@ -2098,7 +2111,7 @@ int ip6_route_get_saddr(struct net *net,
         struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt);
         int err = 0;
         if (rt->rt6i_prefsrc.plen)
-                ipv6_addr_copy(saddr, &rt->rt6i_prefsrc.addr);
+                *saddr = rt->rt6i_prefsrc.addr;
         else
                 err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
                                          daddr, prefs, saddr);
@@ -2118,7 +2131,7 @@ static int fib6_remove_prefsrc(struct rt6_info *rt, void *arg)
         struct net *net = ((struct arg_dev_net_ip *)arg)->net;
         struct in6_addr *addr = ((struct arg_dev_net_ip *)arg)->addr;
 
-        if (((void *)rt->rt6i_dev == dev || dev == NULL) &&
+        if (((void *)rt->dst.dev == dev || !dev) &&
             rt != net->ipv6.ip6_null_entry &&
             ipv6_addr_equal(addr, &rt->rt6i_prefsrc.addr)) {
                 /* remove prefsrc entry */
@@ -2148,11 +2161,10 @@ static int fib6_ifdown(struct rt6_info *rt, void *arg)
         const struct arg_dev_net *adn = arg;
         const struct net_device *dev = adn->dev;
 
-        if ((rt->rt6i_dev == dev || dev == NULL) &&
-            rt != adn->net->ipv6.ip6_null_entry) {
-                RT6_TRACE("deleted by ifdown %p\n", rt);
+        if ((rt->dst.dev == dev || !dev) &&
+            rt != adn->net->ipv6.ip6_null_entry)
                 return -1;
-        }
+
         return 0;
 }
 
@@ -2185,7 +2197,7 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
         */
 
         idev = __in6_dev_get(arg->dev);
-        if (idev == NULL)
+        if (!idev)
                 return 0;
 
         /* For administrative MTU increase, there is no way to discover
@@ -2202,7 +2214,7 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
            also have the lowest MTU, TOO BIG MESSAGE will be lead to
            PMTU discouvery.
          */
-        if (rt->rt6i_dev == arg->dev &&
+        if (rt->dst.dev == arg->dev &&
             !dst_metric_locked(&rt->dst, RTAX_MTU) &&
             (dst_mtu(&rt->dst) >= arg->mtu ||
              (dst_mtu(&rt->dst) < arg->mtu &&
@@ -2351,11 +2363,13 @@ static int rt6_fill_node(struct net *net,
                          int iif, int type, u32 pid, u32 seq,
                          int prefix, int nowait, unsigned int flags)
 {
+        const struct inet_peer *peer;
         struct rtmsg *rtm;
         struct nlmsghdr *nlh;
         long expires;
         u32 table;
         struct neighbour *n;
+        u32 ts, tsage;
 
         if (prefix) {   /* user wants prefix routes only */
                 if (!(rt->rt6i_flags & RTF_PREFIX_RT)) {
@@ -2365,7 +2379,7 @@ static int rt6_fill_node(struct net *net,
         }
 
         nlh = nlmsg_put(skb, pid, seq, type, sizeof(*rtm), flags);
-        if (nlh == NULL)
+        if (!nlh)
                 return -EMSGSIZE;
 
         rtm = nlmsg_data(nlh);
@@ -2379,25 +2393,25 @@ static int rt6_fill_node(struct net *net,
                 table = RT6_TABLE_UNSPEC;
         rtm->rtm_table = table;
         NLA_PUT_U32(skb, RTA_TABLE, table);
-        if (rt->rt6i_flags&RTF_REJECT)
+        if (rt->rt6i_flags & RTF_REJECT)
                 rtm->rtm_type = RTN_UNREACHABLE;
-        else if (rt->rt6i_flags&RTF_LOCAL)
+        else if (rt->rt6i_flags & RTF_LOCAL)
                 rtm->rtm_type = RTN_LOCAL;
-        else if (rt->rt6i_dev && (rt->rt6i_dev->flags&IFF_LOOPBACK))
+        else if (rt->dst.dev && (rt->dst.dev->flags & IFF_LOOPBACK))
                 rtm->rtm_type = RTN_LOCAL;
         else
                 rtm->rtm_type = RTN_UNICAST;
         rtm->rtm_flags = 0;
         rtm->rtm_scope = RT_SCOPE_UNIVERSE;
         rtm->rtm_protocol = rt->rt6i_protocol;
-        if (rt->rt6i_flags&RTF_DYNAMIC)
+        if (rt->rt6i_flags & RTF_DYNAMIC)
                 rtm->rtm_protocol = RTPROT_REDIRECT;
         else if (rt->rt6i_flags & RTF_ADDRCONF)
                 rtm->rtm_protocol = RTPROT_KERNEL;
-        else if (rt->rt6i_flags&RTF_DEFAULT)
+        else if (rt->rt6i_flags & RTF_DEFAULT)
                 rtm->rtm_protocol = RTPROT_RA;
 
-        if (rt->rt6i_flags&RTF_CACHE)
+        if (rt->rt6i_flags & RTF_CACHE)
                 rtm->rtm_flags |= RTM_F_CLONED;
 
         if (dst) {
@@ -2437,7 +2451,7 @@ static int rt6_fill_node(struct net *net,
 
         if (rt->rt6i_prefsrc.plen) {
                 struct in6_addr saddr_buf;
-                ipv6_addr_copy(&saddr_buf, &rt->rt6i_prefsrc.addr);
+                saddr_buf = rt->rt6i_prefsrc.addr;
                 NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
         }
 
@@ -2445,24 +2459,31 @@ static int rt6_fill_node(struct net *net,
                 goto nla_put_failure;
 
         rcu_read_lock();
-        n = dst_get_neighbour(&rt->dst);
+        n = dst_get_neighbour_noref(&rt->dst);
         if (n)
                 NLA_PUT(skb, RTA_GATEWAY, 16, &n->primary_key);
         rcu_read_unlock();
 
         if (rt->dst.dev)
-                NLA_PUT_U32(skb, RTA_OIF, rt->rt6i_dev->ifindex);
+                NLA_PUT_U32(skb, RTA_OIF, rt->dst.dev->ifindex);
 
         NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric);
 
         if (!(rt->rt6i_flags & RTF_EXPIRES))
                 expires = 0;
-        else if (rt->rt6i_expires - jiffies < INT_MAX)
-                expires = rt->rt6i_expires - jiffies;
+        else if (rt->dst.expires - jiffies < INT_MAX)
+                expires = rt->dst.expires - jiffies;
         else
                 expires = INT_MAX;
 
-        if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0,
+        peer = rt->rt6i_peer;
+        ts = tsage = 0;
+        if (peer && peer->tcp_ts_stamp) {
+                ts = peer->tcp_ts;
+                tsage = get_seconds() - peer->tcp_ts_stamp;
+        }
+
+        if (rtnl_put_cacheinfo(skb, &rt->dst, 0, ts, tsage,
                                expires, rt->dst.error) < 0)
                 goto nla_put_failure;
 
@@ -2511,14 +2532,14 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
                 if (nla_len(tb[RTA_SRC]) < sizeof(struct in6_addr))
                         goto errout;
 
-                ipv6_addr_copy(&fl6.saddr, nla_data(tb[RTA_SRC]));
+                fl6.saddr = *(struct in6_addr *)nla_data(tb[RTA_SRC]);
         }
 
         if (tb[RTA_DST]) {
                 if (nla_len(tb[RTA_DST]) < sizeof(struct in6_addr))
                         goto errout;
 
-                ipv6_addr_copy(&fl6.daddr, nla_data(tb[RTA_DST]));
+                fl6.daddr = *(struct in6_addr *)nla_data(tb[RTA_DST]);
         }
 
         if (tb[RTA_IIF])
@@ -2537,7 +2558,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
         }
 
         skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
-        if (skb == NULL) {
+        if (!skb) {
                 err = -ENOBUFS;
                 goto errout;
         }
@@ -2572,10 +2593,10 @@ void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info)
         int err;
 
         err = -ENOBUFS;
-        seq = info->nlh != NULL ? info->nlh->nlmsg_seq : 0;
+        seq = info->nlh ? info->nlh->nlmsg_seq : 0;
 
         skb = nlmsg_new(rt6_nlmsg_size(), gfp_any());
-        if (skb == NULL)
+        if (!skb)
                 goto errout;
 
         err = rt6_fill_node(net, skb, rt, NULL, NULL, 0,
@@ -2642,7 +2663,7 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
         seq_puts(m, "00000000000000000000000000000000 00 ");
 #endif
         rcu_read_lock();
-        n = dst_get_neighbour(&rt->dst);
+        n = dst_get_neighbour_noref(&rt->dst);
         if (n) {
                 seq_printf(m, "%pi6", n->primary_key);
         } else {
@@ -2652,7 +2673,7 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
         seq_printf(m, " %08x %08x %08x %08x %8s\n",
                    rt->rt6i_metric, atomic_read(&rt->dst.__refcnt),
                    rt->dst.__use, rt->rt6i_flags,
-                   rt->rt6i_dev ? rt->rt6i_dev->name : "");
+                   rt->dst.dev ? rt->dst.dev->name : "");
         return 0;
 }