net: Make mpls_entry_encode() available for generic users (86ae579c) · Commits · 戴 / test

include/net/mpls.h

+17 −0

Original line number	Diff line number	Diff line
		@@ -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

+0 −11

Original line number	Diff line number	Diff line
		@@ -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;