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 5f38b41..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. */
@@ -266,34 +266,16 @@ rte_ether_format_addr(char *buf, uint16_t size,
 int
 rte_ether_unformat_addr(const char *str, struct rte_ether_addr *eth_addr);
 
-/* Windows Sockets headers contain `#define s_addr S_un.S_addr`.
- * Temporarily disable this macro to avoid conflict at definition.
- * Place source MAC address in both `s_addr` and `S_un.S_addr` fields,
- * so that access works either directly or through the macro.
- */
-#pragma push_macro("s_addr")
-#ifdef s_addr
-#undef s_addr
-#endif
-
 /**
  * Ethernet header: Contains the destination address, source address
  * and frame type.
  */
 struct rte_ether_hdr {
-       struct rte_ether_addr d_addr; /**< Destination address. */
-       RTE_STD_C11
-       union {
-               struct rte_ether_addr s_addr; /**< Source address. */
-               struct {
-                       struct rte_ether_addr S_addr;
-               } S_un; /**< Do not use directly; use s_addr instead.*/
-       };
+       struct rte_ether_addr dst_addr; /**< Destination address. */
+       struct rte_ether_addr src_addr; /**< Source address. */
        rte_be16_t ether_type; /**< Frame type. */
 } __rte_aligned(2);
 
-#pragma pop_macro("s_addr")
-
 /**
  * Ethernet VLAN Header.
  * Contains the 16-bit VLAN Tag Control Identifier and the Ethernet type
@@ -349,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 */
@@ -385,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;
@@ -396,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);