Re: [dpdk-dev] [PATCH v3 2/3] net: replace htons with rte_cpu_to_be_16

[Fady Bader]

> -----Original Message-----
> From: Olivier Matz <olivier.m...@6wind.com>
> Sent: Monday, July 13, 2020 5:39 PM
> To: Fady Bader <f...@mellanox.com>
> Cc: dev@dpdk.org; Thomas Monjalon <tho...@monjalon.net>; Tasnim Bashar
> <tbas...@mellanox.com>; Tal Shnaiderman <tal...@mellanox.com>; Yohad Tor
> <yoh...@mellanox.com>; dmitry.kozl...@gmail.com;
> harini.ramakrish...@microsoft.com; ocard...@microsoft.com;
> pallavi.ka...@intel.com; ranjit.me...@intel.com
> Subject: Re: [PATCH v3 2/3] net: replace htons with rte_cpu_to_be_16
> 
> On Wed, Jul 08, 2020 at 11:25:24AM +0300, Fady Bader wrote:
> > htons wasn't defined in Windows for the minGW compiler.
> > htons was replaced with rte_cpu_to_be_16 in order to compile under
> > Windows.
> >
> > Signed-off-by: Fady Bader <f...@mellanox.com>
> > ---
> >  lib/librte_net/rte_arp.c | 11 +++++++----
> >  1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/librte_net/rte_arp.c b/lib/librte_net/rte_arp.c index
> > 784b7f48fa..227a6396de 100644
> > --- a/lib/librte_net/rte_arp.c
> > +++ b/lib/librte_net/rte_arp.c
> > @@ -2,9 +2,12 @@
> >   * Copyright(c) 2018 Intel Corporation
> >   */
> >
> > +#ifndef RTE_EXEC_ENV_WINDOWS
> >  #include <arpa/inet.h>
> > +#endif
> 
> Is arpa/inet.h still needed if you remove htons?

No its no longer needed, I'll remove these lines in the new patch.

> 
> >
> >  #include <rte_arp.h>
> > +#include <rte_byteorder.h>
> >
> >  #define RARP_PKT_SIZE      64
> >  struct rte_mbuf *
> > @@ -32,15 +35,15 @@ rte_net_make_rarp_packet(struct rte_mempool
> *mpool,
> >     /* Ethernet header. */
> >     memset(eth_hdr->d_addr.addr_bytes, 0xff, RTE_ETHER_ADDR_LEN);
> >     rte_ether_addr_copy(mac, &eth_hdr->s_addr);
> > -   eth_hdr->ether_type = htons(RTE_ETHER_TYPE_RARP);
> > +   eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_RARP);
> >
> >     /* RARP header. */
> >     rarp = (struct rte_arp_hdr *)(eth_hdr + 1);
> > -   rarp->arp_hardware = htons(RTE_ARP_HRD_ETHER);
> > -   rarp->arp_protocol = htons(RTE_ETHER_TYPE_IPV4);
> > +   rarp->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER);
> > +   rarp->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
> >     rarp->arp_hlen = RTE_ETHER_ADDR_LEN;
> >     rarp->arp_plen = 4;
> > -   rarp->arp_opcode  = htons(RTE_ARP_OP_REVREQUEST);
> > +   rarp->arp_opcode  = rte_cpu_to_be_16(RTE_ARP_OP_REVREQUEST);
> >
> >     rte_ether_addr_copy(mac, &rarp->arp_data.arp_sha);
> >     rte_ether_addr_copy(mac, &rarp->arp_data.arp_tha);
> > --
> > 2.16.1.windows.4
> >