On 5/21/2019 5:13 PM, Olivier Matz wrote: > Also rename arp_hrd, arp_pro, arp_hln, arp_pln and arp_op fields > to avoid conflict with the #defines in gnu libc. > > Signed-off-by: Olivier Matz <olivier.m...@6wind.com>
<...> > @@ -614,7 +614,7 @@ mode6_debug(const char __attribute__((unused)) *info, > struct ether_hdr *eth_h, > } > #ifdef RTE_LIBRTE_BOND_DEBUG_ALB > else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_ARP)) { > - arp_h = (struct arp_hdr *)((char *)(eth_h + 1) + offset); > + arp_h = (struct rte_arp_hdr *)((char *)(eth_h + 1) + offset); > ipv4_addr_to_dot(arp_h->arp_data.arp_sip, src_ip, > MaxIPv4String); > ipv4_addr_to_dot(arp_h->arp_data.arp_tip, dst_ip, > MaxIPv4String); > arp_op_name(rte_be_to_cpu_16(arp_h->arp_op), There is one 'arp_op' seems left here (should be 'arp_opcode'), I am fixing while merging.