git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
examples/pipeline: fix build
[dpdk.git]
/
lib
/
net
/
rte_ether.h
diff --git
a/lib/net/rte_ether.h
b/lib/net/rte_ether.h
index
2c7da55
..
bf8a55b
100644
(file)
--- a/
lib/net/rte_ether.h
+++ b/
lib/net/rte_ether.h
@@
-18,7
+18,6
@@
extern "C" {
#include <stdint.h>
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
-#include <rte_memcpy.h>
#include <rte_random.h>
#include <rte_mbuf.h>
#include <rte_byteorder.h>
#include <rte_random.h>
#include <rte_mbuf.h>
#include <rte_byteorder.h>
@@
-35,9
+34,10
@@
extern "C" {
(RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN - \
RTE_ETHER_CRC_LEN) /**< Ethernet MTU. */
(RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN - \
RTE_ETHER_CRC_LEN) /**< Ethernet MTU. */
+#define RTE_VLAN_HLEN 4 /**< VLAN (IEEE 802.1Q) header length. */
+/** Maximum VLAN frame length (excluding QinQ), including CRC. */
#define RTE_ETHER_MAX_VLAN_FRAME_LEN \
#define RTE_ETHER_MAX_VLAN_FRAME_LEN \
- (RTE_ETHER_MAX_LEN + 4)
- /**< Maximum VLAN frame length, including CRC. */
+ (RTE_ETHER_MAX_LEN + RTE_VLAN_HLEN)
#define RTE_ETHER_MAX_JUMBO_FRAME_LEN \
0x3F00 /**< Maximum Jumbo frame length, including CRC. */
#define RTE_ETHER_MAX_JUMBO_FRAME_LEN \
0x3F00 /**< Maximum Jumbo frame length, including CRC. */
@@
-367,7
+367,7
@@
static inline int rte_vlan_insert(struct rte_mbuf **m)
return -EINVAL;
oh = rte_pktmbuf_mtod(*m, struct rte_ether_hdr *);
return -EINVAL;
oh = rte_pktmbuf_mtod(*m, struct rte_ether_hdr *);
- nh = (struct rte_ether_hdr *)
+ nh = (struct rte_ether_hdr *)
(void *)
rte_pktmbuf_prepend(*m, sizeof(struct rte_vlan_hdr));
if (nh == NULL)
return -ENOSPC;
rte_pktmbuf_prepend(*m, sizeof(struct rte_vlan_hdr));
if (nh == NULL)
return -ENOSPC;