aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-12-13 00:35:57 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-13 00:35:57 -0500
commit5170ae824ddf1988a63fb12cbedcff817634c444 (patch)
tree9f1619ca6edd0e8078bfcd9d6123e119b935e43b /net/ipv6
parentabbf46ae0e4954584eac599bec73502c1c805e9e (diff)
net: Abstract RTAX_HOPLIMIT metric accesses behind helper.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/route.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 9b2d7bc7beda..d9405d1863b8 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1104,7 +1104,7 @@ static int ipv6_get_mtu(struct net_device *dev)
1104 1104
1105int ip6_dst_hoplimit(struct dst_entry *dst) 1105int ip6_dst_hoplimit(struct dst_entry *dst)
1106{ 1106{
1107 int hoplimit = dst_metric(dst, RTAX_HOPLIMIT); 1107 int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);
1108 if (hoplimit < 0) { 1108 if (hoplimit < 0) {
1109 struct net_device *dev = dst->dev; 1109 struct net_device *dev = dst->dev;
1110 struct inet6_dev *idev; 1110 struct inet6_dev *idev;
@@ -1310,7 +1310,7 @@ install_route:
1310 } 1310 }
1311 } 1311 }
1312 1312
1313 if (dst_metric(&rt->dst, RTAX_HOPLIMIT) == 0) 1313 if (dst_metric_raw(&rt->dst, RTAX_HOPLIMIT) == 0)
1314 dst_metric_set(&rt->dst, RTAX_HOPLIMIT, -1); 1314 dst_metric_set(&rt->dst, RTAX_HOPLIMIT, -1);
1315 if (!dst_mtu(&rt->dst)) 1315 if (!dst_mtu(&rt->dst))
1316 dst_metric_set(&rt->dst, RTAX_MTU, ipv6_get_mtu(dev)); 1316 dst_metric_set(&rt->dst, RTAX_MTU, ipv6_get_mtu(dev));