diff options
| author | Jiri Benc <jbenc@redhat.com> | 2016-09-30 19:08:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-03 02:00:22 -0400 |
| commit | 85de4a2101acb85c3b1dde465e84596ccca99f2c (patch) | |
| tree | c93484e9f3001d3afb4c030eb632d2994b6b8b84 /include/net | |
| parent | 9095e10edd28e1e4a10ba5ca61fb54d9f74f8968 (diff) | |
| download | linux-0-day-85de4a2101acb85c3b1dde465e84596ccca99f2c.tar.gz linux-0-day-85de4a2101acb85c3b1dde465e84596ccca99f2c.tar.xz | |
openvswitch: use mpls_hdr
skb_mpls_header is equivalent to mpls_hdr now. Use the existing helper
instead.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mpls.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/net/mpls.h b/include/net/mpls.h index 3ebbc0bb57ff3..1dbc669b770e8 100644 --- a/include/net/mpls.h +++ b/include/net/mpls.h @@ -33,16 +33,4 @@ static inline struct mpls_shim_hdr *mpls_hdr(const struct sk_buff *skb) { return (struct mpls_shim_hdr *)skb_network_header(skb); } - -/* - * 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; -} #endif |