---

yaml --- r: 22109 b: refs/heads/master c: 76f9edd h: refs/heads/master i: 22107: f987c03 v: v3
git-mirror · Mar 21, 2006 · cfcacc4 · cfcacc4
1 parent cde0c7c
commit cfcacc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1e783634a64d002c58391cf8150fcb80856a4fe
+refs/heads/master: 76f9edd17d90e11ef04d20fe457dd172fe8157a6
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -1249,6 +1249,8 @@ void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr,
 		nrt->rt6i_nexthop = neigh_clone(rt->rt6i_nexthop);
 		dst_set_expires(&nrt->u.dst, ip6_rt_mtu_expires);
 		nrt->rt6i_flags |= RTF_DYNAMIC|RTF_CACHE|RTF_EXPIRES;
+		if (nrt->rt6i_flags & RTF_REJECT)
+			nrt->u.dst.error = rt->u.dst.error;
 		nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
 		if (allfrag)
 			nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;