8 files changed, 19 insertions, 29 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 232da20e7171..edcb4bbaab7d 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -123,8 +123,6 @@ extern int ipv6_is_mld(struct sk_buff *skb, int nexthdr);
 
 extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len);
 
-extern int ipv6_get_hoplimit(struct net_device *dev);
-
 /*
  *      anycast prototypes (anycast.c)
  */
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 0e2895c8b270..5c3b67c86aef 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -88,6 +88,8 @@ extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
                                            const struct in6_addr *addr,
                                            int anycast);
 
+extern int                      ip6_dst_hoplimit(struct dst_entry *dst);
+
 /*
  *      support functions for ND
  *
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)
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index ed6482667a25..2a4f08c8a02d 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -237,9 +237,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
         if (np)
                 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 = -1;
         if (np)
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index c11c76cab371..8e29fb1d1df6 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -904,9 +904,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
                 dst = sk_dst_get(sk);
                 if (dst) {
                         if (val < 0)
-                                val = dst_metric(dst, RTAX_HOPLIMIT);
-                        if (val < 0)
-                                val = ipv6_get_hoplimit(dst->dev);
+                                val = ip6_dst_hoplimit(dst);
                         dst_release(dst);
                 }
                 if (val < 0)
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index a9e4235157a2..548d0763f4d3 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -885,9 +885,7 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
                 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);
         }
 
         if (tclass < 0) {
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index a4b5aee0f68a..aa3f08718e44 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1034,15 +1034,17 @@ static int ipv6_get_mtu(struct net_device *dev)
         return mtu;
 }
 
-int ipv6_get_hoplimit(struct net_device *dev)
-{
-        int hoplimit = ipv6_devconf.hop_limit;
-        struct inet6_dev *idev;
-
-        idev = in6_dev_get(dev);
-        if (idev) {
-                hoplimit = idev->cnf.hop_limit;
-                in6_dev_put(idev);
+int ip6_dst_hoplimit(struct dst_entry *dst)
+{
+        int hoplimit = dst_metric(dst, RTAX_HOPLIMIT);
+        if (hoplimit < 0) {
+                struct net_device *dev = dst->dev;
+                struct inet6_dev *idev = in6_dev_get(dev);
+                if (idev) {
+                        hoplimit = idev->cnf.hop_limit;
+                        in6_dev_put(idev);
+                } else
+                        hoplimit = ipv6_devconf.hop_limit;
         }
         return hoplimit;
 }
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 5f5d1218c34e..593d3efadaf9 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -792,9 +792,7 @@ do_udp_sendmsg:
                 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);
         }
 
         if (tclass < 0) {