[IPV6]: Optimize hop-limit determination.

Last part of hop-limit determination is always:
    hoplimit = dst_metric(dst, RTAX_HOPLIMIT);
    if (hoplimit < 0)
        hoplimit = ipv6_get_hoplimit(dst->dev).

Let's consolidate it as ip6_dst_hoplimit(dst).

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 6b5391ab8346..86332417b402 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -464,9 +464,7 @@ route_done:
         else
                 hlimit = np->hop_limit;
         if (hlimit < 0)
-                hlimit = dst_metric(dst, RTAX_HOPLIMIT);
-        if (hlimit < 0)
-                hlimit = ipv6_get_hoplimit(dst->dev);
+                hlimit = ip6_dst_hoplimit(dst);
 
         tclass = np->tclass;
         if (tclass < 0)
@@ -560,9 +558,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
         else
                 hlimit = np->hop_limit;
         if (hlimit < 0)
-                hlimit = dst_metric(dst, RTAX_HOPLIMIT);
-        if (hlimit < 0)
-                hlimit = ipv6_get_hoplimit(dst->dev);
+                hlimit = ip6_dst_hoplimit(dst);
 
         tclass = np->tclass;
         if (tclass < 0)