diff options
| author | Jiri Benc <jbenc@redhat.com> | 2016-09-30 19:08:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-03 08:00:21 +0200 |
| commit | 9095e10edd28e1e4a10ba5ca61fb54d9f74f8968 (patch) | |
| tree | c0b3479b54587b1d4d8cc962f9850cd983d39500 /net | |
| parent | openvswitch: mpls: set network header correctly on key extract (diff) | |
| download | linux-9095e10edd28e1e4a10ba5ca61fb54d9f74f8968.tar.xz linux-9095e10edd28e1e4a10ba5ca61fb54d9f74f8968.zip | |
mpls: move mpls_hdr to a common location
This will be also used by openvswitch.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: David Ahern <dsa@cumulusnetworks.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mpls/internal.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/mpls/internal.h b/net/mpls/internal.h index 732a5c17e986..bdfef6c3271a 100644 --- a/net/mpls/internal.h +++ b/net/mpls/internal.h @@ -1,9 +1,6 @@ #ifndef MPLS_INTERNAL_H #define MPLS_INTERNAL_H - -struct mpls_shim_hdr { - __be32 label_stack_entry; -}; +#include <net/mpls.h> struct mpls_entry_decoded { u32 label; @@ -93,11 +90,6 @@ struct mpls_route { /* next hop label forwarding entry */ #define endfor_nexthops(rt) } -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 ttl, unsigned tc, bool bos) { struct mpls_shim_hdr result; |