diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 63abc4fddaee..7e92909ab5be 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -259,6 +259,27 @@ bool ip6_autoflowlabel(struct net *net, const struct sock *sk)
 	return inet6_test_bit(AUTOFLOWLABEL, sk);
 }
 
+int ip6_dst_hoplimit(struct dst_entry *dst)
+{
+	int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);
+
+	rcu_read_lock();
+	if (hoplimit == 0) {
+		struct net_device *dev = dst_dev_rcu(dst);
+		struct inet6_dev *idev;
+
+		idev = __in6_dev_get(dev);
+		if (idev)
+			hoplimit = READ_ONCE(idev->cnf.hop_limit);
+		else
+			hoplimit = READ_ONCE(dev_net(dev)->ipv6.devconf_all->hop_limit);
+	}
+	rcu_read_unlock();
+
+	return hoplimit;
+}
+EXPORT_SYMBOL(ip6_dst_hoplimit);
+
 /*
  * xmit an sk_buff (used by TCP and SCTP)
  * Note : socket lock is not held for SYNACK packets, but might be modified
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index cba1684a3f30..64b1eeb79b57 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -100,29 +100,6 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
 }
 EXPORT_SYMBOL(ip6_find_1stfragopt);
 
-#if IS_ENABLED(CONFIG_IPV6)
-int ip6_dst_hoplimit(struct dst_entry *dst)
-{
-	int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);
-
-	rcu_read_lock();
-	if (hoplimit == 0) {
-		struct net_device *dev = dst_dev_rcu(dst);
-		struct inet6_dev *idev;
-
-		idev = __in6_dev_get(dev);
-		if (idev)
-			hoplimit = READ_ONCE(idev->cnf.hop_limit);
-		else
-			hoplimit = READ_ONCE(dev_net(dev)->ipv6.devconf_all->hop_limit);
-	}
-	rcu_read_unlock();
-
-	return hoplimit;
-}
-EXPORT_SYMBOL(ip6_dst_hoplimit);
-#endif
-
 int __ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)
 {
 	ipv6_set_payload_len(ipv6_hdr(skb), skb->len - sizeof(struct ipv6hdr));