diff options
| author | Ville Nuorvala <vnuorval@tcs.hut.fi> | 2006-10-16 22:14:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-10-18 19:55:30 -0700 |
| commit | 22e1e4d8dcb71762fcbe0c73d720aea8bb2013af (patch) | |
| tree | 41b47368c4fcc927cfd86b891470357c795c1956 | |
| parent | 264e91b68aff1e39b558123498f28bf5aa68b4ee (diff) | |
| download | kernel_samsung_tuna-22e1e4d8dcb71762fcbe0c73d720aea8bb2013af.zip kernel_samsung_tuna-22e1e4d8dcb71762fcbe0c73d720aea8bb2013af.tar.gz kernel_samsung_tuna-22e1e4d8dcb71762fcbe0c73d720aea8bb2013af.tar.bz2 | |
[IPV6]: Always copy rt->u.dst.error when copying a rt6_info.
Signed-off-by: Ville Nuorvala <vnuorval@tcs.hut.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | 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(struct rt6_info *ort, struct in6_addr *d 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(struct rt6_info *ort) 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); |