1 files changed, 6 insertions, 5 deletions

diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 8625fba96db9..bb02038b822b 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -99,12 +99,11 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
         if (!xdst->u.rt6.rt6i_idev)
                 return -ENODEV;
 
-        xdst->u.rt6.rt6i_peer = rt->rt6i_peer;
-        if (rt->rt6i_peer)
-                atomic_inc(&rt->rt6i_peer->refcnt);
+        rt6_transfer_peer(&xdst->u.rt6, rt);
 
         /* Sheit... I remember I did this right. Apparently,
          * it was magically lost, so this code needs audit */
+        xdst->u.rt6.n = neigh_clone(rt->n);
         xdst->u.rt6.rt6i_flags = rt->rt6i_flags & (RTF_ANYCAST |
                                                    RTF_LOCAL);
         xdst->u.rt6.rt6i_metric = rt->rt6i_metric;
@@ -223,8 +222,10 @@ static void xfrm6_dst_destroy(struct dst_entry *dst)
         if (likely(xdst->u.rt6.rt6i_idev))
                 in6_dev_put(xdst->u.rt6.rt6i_idev);
         dst_destroy_metrics_generic(dst);
-        if (likely(xdst->u.rt6.rt6i_peer))
-                inet_putpeer(xdst->u.rt6.rt6i_peer);
+        if (rt6_has_peer(&xdst->u.rt6)) {
+                struct inet_peer *peer = rt6_peer_ptr(&xdst->u.rt6);
+                inet_putpeer(peer);
+        }
         xfrm_dst_destroy(xdst);
 }