Commit a02e4b7d authored by David S. Miller's avatar David S. Miller

ipv6: Demark default hoplimit as zero.

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: default avatarDavid S. Miller <davem@davemloft.net>
parent 5170ae82
...@@ -1105,7 +1105,7 @@ static int ipv6_get_mtu(struct net_device *dev) ...@@ -1105,7 +1105,7 @@ static int ipv6_get_mtu(struct net_device *dev)
int ip6_dst_hoplimit(struct dst_entry *dst) int ip6_dst_hoplimit(struct dst_entry *dst)
{ {
int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT); int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);
if (hoplimit < 0) { if (hoplimit == 0) {
struct net_device *dev = dst->dev; struct net_device *dev = dst->dev;
struct inet6_dev *idev; struct inet6_dev *idev;
...@@ -1310,8 +1310,6 @@ int ip6_route_add(struct fib6_config *cfg) ...@@ -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)) if (!dst_mtu(&rt->dst))
dst_metric_set(&rt->dst, RTAX_MTU, ipv6_get_mtu(dev)); dst_metric_set(&rt->dst, RTAX_MTU, ipv6_get_mtu(dev));
if (!dst_metric(&rt->dst, RTAX_ADVMSS)) if (!dst_metric(&rt->dst, RTAX_ADVMSS))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment