diff options
| author |   John Hurley <john.hurley@netronome.com> | 2019-07-07 15:01:55 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-08 19:50:13 -0700 |
| commit | ed246cee09b9865145a2e1e34f63ec0e31dd83a5 (patch) | |
| tree | b54f4efab46a1766eb9fc7cb4c03d0c512546985 /include/linux/skbuff.h | |
| parent | net: core: move push MPLS functionality from OvS to core helper (diff) | |
| download | linux-dev-ed246cee09b9865145a2e1e34f63ec0e31dd83a5.tar.xz linux-dev-ed246cee09b9865145a2e1e34f63ec0e31dd83a5.zip | |
net: core: move pop MPLS functionality from OvS to core helper
Open vSwitch provides code to pop an MPLS header to a packet. In
preparation for supporting this in TC, move the pop code to an skb helper
that can be reused.
Remove the, now unused, update_ethertype static function from OvS.
Signed-off-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 1dc55000710c..08d1c8e70540 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3448,6 +3448,7 @@ int __skb_vlan_pop(struct sk_buff *skb, u16 *vlan_tci); int skb_vlan_pop(struct sk_buff *skb); int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci); int skb_mpls_push(struct sk_buff *skb, __be32 mpls_lse, __be16 mpls_proto); +int skb_mpls_pop(struct sk_buff *skb, __be16 next_proto); struct sk_buff *pskb_extract(struct sk_buff *skb, int off, int to_copy, gfp_t gfp); |