diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-11-01 11:59:50 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-11-01 12:00:19 +0000 |
| commit | 8d01b9cd70a67cdafd5b965a70420c3bd7fb3f82 (patch) | |
| tree | 208e3bc33c220854d89d010e3abf720a2e62e546 /lib/librte_net/rte_net.c | |
| parent | b63264c8342e6a1b6971c79550d2af2024b6a4de (diff) | |
New upstream version 18.11-rc1upstream/18.11-rc1
Change-Id: Iaa71986dd6332e878d8f4bf493101b2bbc6313bb
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_net/rte_net.c')
| -rw-r--r-- | lib/librte_net/rte_net.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c index 9eb7c743..378a4126 100644 --- a/lib/librte_net/rte_net.c +++ b/lib/librte_net/rte_net.c @@ -13,6 +13,7 @@ #include <rte_udp.h> #include <rte_sctp.h> #include <rte_gre.h> +#include <rte_mpls.h> #include <rte_net.h> /* get l3 packet type from ip6 next protocol */ @@ -274,9 +275,27 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, off += 2 * sizeof(*vh); hdr_lens->l2_len += 2 * sizeof(*vh); proto = vh->eth_proto; + } else if ((proto == rte_cpu_to_be_16(ETHER_TYPE_MPLS)) || + (proto == rte_cpu_to_be_16(ETHER_TYPE_MPLSM))) { + unsigned int i; + const struct mpls_hdr *mh; + struct mpls_hdr mh_copy; + +#define MAX_MPLS_HDR 5 + for (i = 0; i < MAX_MPLS_HDR; i++) { + mh = rte_pktmbuf_read(m, off + (i * sizeof(*mh)), + sizeof(*mh), &mh_copy); + if (unlikely(mh == NULL)) + return pkt_type; + } + if (i == MAX_MPLS_HDR) + return pkt_type; + pkt_type = RTE_PTYPE_L2_ETHER_MPLS; + hdr_lens->l2_len += (sizeof(*mh) * i); + return pkt_type; } - l3: +l3: if ((layers & RTE_PTYPE_L3_MASK) == 0) return pkt_type; |