]> err.no Git - linux-2.6/commitdiff
[IPV6]: ROUTE: Set appropriate information before inserting a route.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Tue, 21 Mar 2006 00:56:32 +0000 (16:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Mar 2006 00:56:32 +0000 (16:56 -0800)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/route.c

index e8855706980f3c524d4f42b087faec3a6e2a9385..5b58a516bb162dbe89a5ea83e593444502b7a63b 100644 (file)
@@ -1221,21 +1221,24 @@ void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr,
           2. It is gatewayed route or NONEXTHOP route. Action: clone it.
         */
        if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
-               nrt = rt6_cow(rt, daddr, saddr, NULL);
-               if (!nrt->u.dst.error) {
-                       nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
-                       if (allfrag)
-                               nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
-                       /* According to RFC 1981, detecting PMTU increase shouldn't be
-                          happened within 5 mins, the recommended timer is 10 mins.
-                          Here this route expiration time is set to ip6_rt_mtu_expires
-                          which is 10 mins. After 10 mins the decreased pmtu is expired
-                          and detecting PMTU increase will be automatically happened.
-                        */
-                       dst_set_expires(&nrt->u.dst, ip6_rt_mtu_expires);
-                       nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES;
-               }
-               dst_release(&nrt->u.dst);
+               nrt = rt6_alloc_cow(rt, daddr, saddr);
+               if (!nrt)
+                       goto out;
+
+               nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
+               if (allfrag)
+                       nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
+
+               /* According to RFC 1981, detecting PMTU increase shouldn't be
+                * happened within 5 mins, the recommended timer is 10 mins.
+                * Here this route expiration time is set to ip6_rt_mtu_expires
+                * which is 10 mins. After 10 mins the decreased pmtu is expired
+                * and detecting PMTU increase will be automatically happened.
+                */
+               dst_set_expires(&nrt->u.dst, ip6_rt_mtu_expires);
+               nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES;
+
+               ip6_ins_rt(nrt, NULL, NULL, NULL);
        } else {
                nrt = ip6_rt_copy(rt);
                if (nrt == NULL)