summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorThomas Egerer <thomas.egerer@secunet.com>2011-04-20 22:56:02 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-03 10:33:55 +0900
commit124035df30f4a57658d744d2720a92711355bd6b (patch)
tree84581f2485a711cc0c36ad2c022d93fca634d858 /net
parent73503196fb0362a35b9b05c0625f80805f793e29 (diff)
ipv6: Remove hoplimit initialization to -1
[ Upstream commit e965c05dabdabb85af0187952ccd75e43995c4b3 ] The changes introduced with git-commit a02e4b7d ("ipv6: Demark default hoplimit as zero.") missed to remove the hoplimit initialization. As a result, ipv6_get_mtu interprets the return value of dst_metric_raw (-1) as 255 and answers ping6 with this hoplimit. This patche removes the line such that ping6 is answered with the hoplimit value configured via sysctl. Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/route.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e7db7014e89f..57c20dc41ccb 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1970,7 +1970,6 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
rt->dst.output = ip6_output;
rt->rt6i_dev = net->loopback_dev;
rt->rt6i_idev = idev;
- dst_metric_set(&rt->dst, RTAX_HOPLIMIT, -1);
rt->dst.obsolete = -1;
rt->rt6i_flags = RTF_UP | RTF_NONEXTHOP;