1 files changed, 4 insertions, 7 deletions

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 17b8c67998bb..62fcf3e48aca 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -463,6 +463,7 @@ int ip6_forward(struct sk_buff *skb)
          */
         if (skb->dev == dst->dev && opt->srcrt == 0 && !skb_sec_path(skb)) {
                 struct in6_addr *target = NULL;
+                struct inet_peer *peer;
                 struct rt6_info *rt;
 
                 /*
@@ -476,13 +477,12 @@ int ip6_forward(struct sk_buff *skb)
                 else
                         target = &hdr->daddr;
 
-                if (!rt->rt6i_peer)
-                        rt6_bind_peer(rt, 1);
+                peer = rt6_get_peer_create(rt);
 
                 /* Limit redirects both by destination (here)
                    and by source (inside ndisc_send_redirect)
                  */
-                if (inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ))
+                if (inet_peer_xrlim_allow(peer, 1*HZ))
                         ndisc_send_redirect(skb, target);
         } else {
                 int addrtype = ipv6_addr_type(&hdr->saddr);
@@ -602,11 +602,8 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
         int old, new;
 
         if (rt && !(rt->dst.flags & DST_NOPEER)) {
-                struct inet_peer *peer;
+                struct inet_peer *peer = rt6_get_peer_create(rt);
 
-                if (!rt->rt6i_peer)
-                        rt6_bind_peer(rt, 1);
-                peer = rt->rt6i_peer;
                 if (peer) {
                         fhdr->identification = htonl(inet_getid(peer, 0));
                         return;