Skip to content

Commit

Permalink
ipv6: Demark default hoplimit as zero.
Browse files Browse the repository at this point in the history
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 <davem@davemloft.net>
  • Loading branch information
davem330 committed Dec 13, 2010
1 parent 5170ae8 commit a02e4b7
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions net/ipv6/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit a02e4b7

Please sign in to comment.