On Thu, Sep 29, 2016 at 12:19 PM, Jiri Benc <jb...@redhat.com> wrote:
> skb_mpls_header is equivalent to skb_network_header now. There's no reason
> to keep it.
>
> Signed-off-by: Jiri Benc <jb...@redhat.com>
> ---
> include/net/mpls.h | 11 -----------
> net/openvswitch/actions.c | 10 +++++-----
> 2 files changed, 5 insertions(+), 16 deletions(-)
>
> diff --git a/include/net/mpls.h b/include/net/mpls.h
> index 5b3b5addfb08..fde22d0b0ec1 100644
> --- a/include/net/mpls.h
> +++ b/include/net/mpls.h
> @@ -25,15 +25,4 @@ static inline bool eth_p_mpls(__be16 eth_type)
> eth_type == htons(ETH_P_MPLS_MC);
> }
>
> -/*
> - * For non-MPLS skbs this will correspond to the network header.
> - * For MPLS skbs it will be before the network_header as the MPLS
> - * label stack lies between the end of the mac header and the network
> - * header. That is, for MPLS skbs the end of the mac header
> - * is the top of the MPLS label stack.
> - */
> -static inline unsigned char *skb_mpls_header(struct sk_buff *skb)
> -{
> - return skb_mac_header(skb) + skb->mac_len;
> -}
I think we should keep this API, so that it is clear that MPLS header
mapped skb network header.
