*/
static inline int rte_is_broadcast_ether_addr(const struct rte_ether_addr *ea)
{
- const uint16_t *ea_words = (const uint16_t *)ea;
+ const uint16_t *w = (const uint16_t *)ea;
- return (ea_words[0] == 0xFFFF && ea_words[1] == 0xFFFF &&
- ea_words[2] == 0xFFFF);
+ return (w[0] & w[1] & w[2]) == 0xFFFF;
}
/**
rte_eth_random_addr(uint8_t *addr);
/**
- * Fast copy an Ethernet address.
+ * Copy an Ethernet address.
*
* @param ea_from
* A pointer to a ether_addr structure holding the Ethernet address to copy.
* @param ea_to
* A pointer to a ether_addr structure where to copy the Ethernet address.
*/
-static inline void rte_ether_addr_copy(const struct rte_ether_addr *ea_from,
- struct rte_ether_addr *ea_to)
+static inline void
+rte_ether_addr_copy(const struct rte_ether_addr *__restrict ea_from,
+ struct rte_ether_addr *__restrict ea_to)
{
-#ifdef __INTEL_COMPILER
- uint16_t *from_words = (uint16_t *)(ea_from->addr_bytes);
- uint16_t *to_words = (uint16_t *)(ea_to->addr_bytes);
-
- to_words[0] = from_words[0];
- to_words[1] = from_words[1];
- to_words[2] = from_words[2];
-#else
- /*
- * Use the common way, because of a strange gcc warning.
- */
*ea_to = *ea_from;
-#endif
}
#define RTE_ETHER_ADDR_FMT_SIZE 18
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. */
- struct rte_ether_addr s_addr; /**< Source address. */
- uint16_t ether_type; /**< Frame type. */
+ 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.*/
+ };
+ uint16_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
#define RTE_ETHER_TYPE_LLDP 0x88CC /**< LLDP Protocol. */
#define RTE_ETHER_TYPE_MPLS 0x8847 /**< MPLS ethertype. */
#define RTE_ETHER_TYPE_MPLSM 0x8848 /**< MPLS multicast ethertype. */
+#define RTE_ETHER_TYPE_ECPRI 0xAEFE /**< eCPRI ethertype (.1Q supported). */
/**
* Extract VLAN tag information into mbuf
if (!RTE_MBUF_DIRECT(*m) || rte_mbuf_refcnt_read(*m) > 1)
return -EINVAL;
+ /* Can't insert header if the first segment is too short */
+ if (rte_pktmbuf_data_len(*m) < 2 * RTE_ETHER_ADDR_LEN)
+ return -EINVAL;
+
oh = rte_pktmbuf_mtod(*m, struct rte_ether_hdr *);
nh = (struct rte_ether_hdr *)
rte_pktmbuf_prepend(*m, sizeof(struct rte_vlan_hdr));