From 9b8c1e991aba1d234120b93de3342b19679807a8 Mon Sep 17 00:00:00 2001 From: Gao feng Date: Fri, 28 Oct 2011 02:46:57 +0000 Subject: [PATCH] --- yaml --- r: 271619 b: refs/heads/master c: 7011687f0f2f12cc348f6a693fafe63d89167eac h: refs/heads/master i: 271617: eef1fa9ca272f273b26622b02c19e702daca6e56 271615: e36eb74819f0294a59e678c506f840b3199616c2 v: v3 --- [refs] | 2 +- trunk/net/ipv6/route.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 32bed41eb442..0a123e5e825d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 504744e4edc24f6f16eed44a59b39bffcc0c1391 +refs/heads/master: 7011687f0f2f12cc348f6a693fafe63d89167eac diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index fb545edef6ea..57b82dc1ae91 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/net/ipv6/route.c @@ -1086,11 +1086,10 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, rt->dst.output = ip6_output; dst_set_neighbour(&rt->dst, neigh); atomic_set(&rt->dst.__refcnt, 1); - dst_metric_set(&rt->dst, RTAX_HOPLIMIT, 255); - ipv6_addr_copy(&rt->rt6i_dst.addr, addr); rt->rt6i_dst.plen = 128; rt->rt6i_idev = idev; + dst_metric_set(&rt->dst, RTAX_HOPLIMIT, 255); spin_lock_bh(&icmp6_dst_lock); rt->dst.next = icmp6_dst_gc_list;