ipv6: Demark default hoplimit as zero.

davem330 · davem330 · commit a02e4b7dae45 · 2010-12-12T21:39:02.000-08:00
This is for consistency with ipv4.  Using "-1" makes
no sense.

It was made this way a long time ago merely to be consistent
with how the ipv6 socket hoplimit "default" is stored.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
@@ -1105,7 +1105,7 @@ static int ipv6_get_mtu(struct net_device *dev)
 int ip6_dst_hoplimit(struct dst_entry *dst)
 {
 	int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);
-	if (hoplimit < 0) {
+	if (hoplimit == 0) {
 		struct net_device *dev = dst->dev;
 		struct inet6_dev *idev;
 
@@ -1310,8 +1310,6 @@ int ip6_route_add(struct fib6_config *cfg)
 		}
 	}
 
-	if (dst_metric_raw(&rt->dst, RTAX_HOPLIMIT) == 0)
-		dst_metric_set(&rt->dst, RTAX_HOPLIMIT, -1);
 	if (!dst_mtu(&rt->dst))
 		dst_metric_set(&rt->dst, RTAX_MTU, ipv6_get_mtu(dev));
 	if (!dst_metric(&rt->dst, RTAX_ADVMSS))

Original file line number	Diff line number	Diff line change
`@@ -1105,7 +1105,7 @@ static int ipv6_get_mtu(struct net_device *dev)`
`1105`	`1105`	`int ip6_dst_hoplimit(struct dst_entry *dst)`
`1106`	`1106`	`{`
`1107`	`1107`	`int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);`
`1108`		`- if (hoplimit < 0) {`
	`1108`	`+ if (hoplimit == 0) {`
`1109`	`1109`	`struct net_device *dev = dst->dev;`
`1110`	`1110`	`struct inet6_dev *idev;`
`1111`	`1111`
`@@ -1310,8 +1310,6 @@ int ip6_route_add(struct fib6_config *cfg)`
`1310`	`1310`	`}`
`1311`	`1311`	`}`
`1312`	`1312`
`1313`		`- if (dst_metric_raw(&rt->dst, RTAX_HOPLIMIT) == 0)`
`1314`		`- dst_metric_set(&rt->dst, RTAX_HOPLIMIT, -1);`
`1315`	`1313`	`if (!dst_mtu(&rt->dst))`
`1316`	`1314`	`dst_metric_set(&rt->dst, RTAX_MTU, ipv6_get_mtu(dev));`
`1317`	`1315`	`if (!dst_metric(&rt->dst, RTAX_ADVMSS))`