net/vmxnet3: support RETA query and update

[dpdk.git] / lib / net / rte_ether.h

diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h
index b83e0d3..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 <rte_memcpy.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. */
 
+#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 \
-       (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. */
@@ -331,7 +331,7 @@ static inline int rte_vlan_strip(struct rte_mbuf *m)
                return -1;
 
        vh = (struct rte_vlan_hdr *)(eh + 1);
-       m->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+       m->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
        m->vlan_tci = rte_be_to_cpu_16(vh->vlan_tci);
 
        /* Copy ether header over rather than moving whole packet */
@@ -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 *);
-       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;
@@ -378,9 +378,9 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
        vh = (struct rte_vlan_hdr *) (nh + 1);
        vh->vlan_tci = rte_cpu_to_be_16((*m)->vlan_tci);
 
-       (*m)->ol_flags &= ~(PKT_RX_VLAN_STRIPPED | PKT_TX_VLAN);
+       (*m)->ol_flags &= ~(RTE_MBUF_F_RX_VLAN_STRIPPED | RTE_MBUF_F_TX_VLAN);
 
-       if ((*m)->ol_flags & PKT_TX_TUNNEL_MASK)
+       if ((*m)->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)
                (*m)->outer_l2_len += sizeof(struct rte_vlan_hdr);
        else
                (*m)->l2_len += sizeof(struct rte_vlan_hdr);