[PATCH 6/13] [IPV6] Always copy rt->u.dst.error when copying a rt6_info.

[PATCH 6/13] [IPV6] Always copy rt->u.dst.error when copying a rt6_info.

[Ville Nuorvala]

Signed-off-by: Ville Nuorvala <vnuorval@tcs.hut.fi>
---
 net/ipv6/route.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 263c057..aa96be8 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -618,8 +618,6 @@ static struct rt6_info *rt6_alloc_clone(
 		ipv6_addr_copy(&rt->rt6i_dst.addr, daddr);
 		rt->rt6i_dst.plen = 128;
 		rt->rt6i_flags |= RTF_CACHE;
-		if (rt->rt6i_flags & RTF_REJECT)
-			rt->u.dst.error = ort->u.dst.error;
 		rt->u.dst.flags |= DST_HOST;
 		rt->rt6i_nexthop = neigh_clone(ort->rt6i_nexthop);
 	}
@@ -1540,6 +1538,7 @@ static struct rt6_info * ip6_rt_copy(str
 		rt->u.dst.output = ort->u.dst.output;

 		memcpy(rt->u.dst.metrics, ort->u.dst.metrics, RTAX_MAX*sizeof(u32));
+		rt->u.dst.error = ort->u.dst.error;
 		rt->u.dst.dev = ort->u.dst.dev;
 		if (rt->u.dst.dev)
 			dev_hold(rt->u.dst.dev);
-- 
1.4.2.3

Re: [PATCH 6/13] [IPV6] Always copy rt->u.dst.error when copying a rt6_info.

[David Miller]

From: Ville Nuorvala <vnuorval@tcs.hut.fi>
Date: Tue, 17 Oct 2006 03:10:49 +0300

> Signed-off-by: Ville Nuorvala <vnuorval@tcs.hut.fi>

Looks good, applied.

Ville, can you fixup Thunderbird to not corrupt your patches?
The specific corruption is that if the patch has a completely
empty line with just a space at the beginning, thunderbird is
killing that space which makes the patch bad (at least in GIT's
eyes, which is all that matters :-)

Thanks!