diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
| commit | 4327974639c4d7f8688f564081956f8f79ef053c (patch) | |
| tree | 0ca57c56b2f76a39f476e8f22b0112aa566b3a86 /net/ipv6/route.c | |
| parent | c3e5127312f97482a6a09c0df602c726675eff5b (diff) | |
| parent | f6b252b6b92671d2633008408c06d35c26e55ecf (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Diffstat (limited to 'net/ipv6/route.c')
| -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 fb545edef6e..57b82dc1ae9 100644 --- a/net/ipv6/route.c +++ b/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; |