net: Make mpls_entry_encode() available for generic users

Move mpls_entry_encode() from net/mpls/internal.h to include/net/mpls.h
and make it available for other users. Specifically, hardware driver that
offload MPLS can benefit from that.

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Suggested-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/include/net/mpls.h b/include/net/mpls.h
index ccaf238e8ea70d6c53a14d7a8385c4ab8b2fd777..0bb7944e7b08392bc16d13dc17dcc19871c30f17 100644 (file)
--- a/include/net/mpls.h
+++ b/include/net/mpls.h
@@ -8,6 +8,7 @@
 
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
+#include <linux/mpls.h>
 
 #define MPLS_HLEN 4
 
@@ -25,4 +26,20 @@ static inline struct mpls_shim_hdr *mpls_hdr(const struct sk_buff *skb)
 {
        return (struct mpls_shim_hdr *)skb_network_header(skb);
 }
+
+static inline struct mpls_shim_hdr mpls_entry_encode(u32 label,
+                                                    unsigned int ttl,
+                                                    unsigned int tc,
+                                                    bool bos)
+{
+       struct mpls_shim_hdr result;
+
+       result.label_stack_entry =
+               cpu_to_be32((label << MPLS_LS_LABEL_SHIFT) |
+                           (tc << MPLS_LS_TC_SHIFT) |
+                           (bos ? (1 << MPLS_LS_S_SHIFT) : 0) |
+                           (ttl << MPLS_LS_TTL_SHIFT));
+       return result;
+}
+
 #endif

diff --git a/net/mpls/internal.h b/net/mpls/internal.h
index 0e9aa94adc07fabe25cb91cb67c507af15c1a60e..838cdfc10e47d6efd51a7f89c674458f845e6a44 100644 (file)
--- a/net/mpls/internal.h
+++ b/net/mpls/internal.h
@@ -172,17 +172,6 @@ struct mpls_route { /* next hop label forwarding entry */
 
 #define endfor_nexthops(rt) }
 
-static inline struct mpls_shim_hdr mpls_entry_encode(u32 label, unsigned ttl, unsigned tc, bool bos)
-{
-       struct mpls_shim_hdr result;
-       result.label_stack_entry =
-               cpu_to_be32((label << MPLS_LS_LABEL_SHIFT) |
-                           (tc << MPLS_LS_TC_SHIFT) |
-                           (bos ? (1 << MPLS_LS_S_SHIFT) : 0) |
-                           (ttl << MPLS_LS_TTL_SHIFT));
-       return result;
-}
-
 static inline struct mpls_entry_decoded mpls_entry_decode(struct mpls_shim_hdr *hdr)
 {
        struct mpls_entry_decoded result;