net: ipv6: Introduce ip6_sk_dst_hoplimit.

This replaces 6 identical code snippets with a call to a new
static inline function.

Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 8 deletions

diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 7704ea9502fd..e472d44a3b91 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -605,14 +605,8 @@ static int l2tp_ip6_sendmsg(struct kiocb *iocb, struct sock *sk,
                 goto out;
         }
 
-        if (hlimit < 0) {
-                if (ipv6_addr_is_multicast(&fl6.daddr))
-                        hlimit = np->mcast_hops;
-                else
-                        hlimit = np->hop_limit;
-                if (hlimit < 0)
-                        hlimit = ip6_dst_hoplimit(dst);
-        }
+        if (hlimit < 0)
+                hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);
 
         if (tclass < 0)
                 tclass = np->tclass;