From patchwork Wed Sep 15 21:40:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 98960 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2851CA0C41; Wed, 15 Sep 2021 23:41:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDDAF410F8; Wed, 15 Sep 2021 23:41:12 +0200 (CEST) Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by mails.dpdk.org (Postfix) with ESMTP id DA5A84111D for ; Wed, 15 Sep 2021 23:41:10 +0200 (CEST) Received: by mail-lf1-f49.google.com with SMTP id m3so8159192lfu.2 for ; Wed, 15 Sep 2021 14:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NeJZuZMQ3VtmJG5aHSijKuU+maODocVqNfZ3VrWHGCI=; b=XZgetonG7oWKWCvkjtaLqqLrWgCmrN7ZgPYd+6RpsxmwwM2z9tBzLPrDBb2t0/GTeq oDyZr4NRKRZhXgCg8F5qB9+kh6KVJk9x47BDxMMnV8j1w8Whhx5znGrxHQzYNkf9z9aX B9poEL60HVkmpmr5j9pqll+ujeeTJYqbsOvHAeFRFTPqAdEaLM37wPMoH3pj/2nWL/PL fYF7ZkYlwCPt4CqQ8/JKN/CzfQ19Z2Yt6YUPTTYfGKp/mt0heo1r/RthFXiz5rdSX+I/ vkO3sp3M3Y5tI4bM+w4ykZEY9gxhf/eLQTvDOZYkltnyhLdmLsajCGK91/wkroly3wId 00FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NeJZuZMQ3VtmJG5aHSijKuU+maODocVqNfZ3VrWHGCI=; b=gI2jGeNmPFDHXL8CgVVwvHK9oVKMFTc3FqnckmpOkhmcUrVOFS4G85lTeAsUZOqmK7 36iQ9or01AcNrqv2fnHEJIvDENf9NuzqWs2HJGImkhBblabY8S4GXZ7rIpnDJHmK36GI qH5/tQvTEcjI7+jHhODUWK1C1qHqurcwc/vBFEZ95eJvV4H0KT2d1nXhas0Qk56VgSNj rQwvGKxBxGv7goCPvd2Z+kVLWiDHullT15SFzeUTcPNDCNmXYNIWn4bDvI6JS8wijRMf k+H445kSJtNOHrFBzL5HTQLTFL52L1tEYFizhl/azTrdDUQokFPE+jgWzVAM6lCHBrId 9cVw== X-Gm-Message-State: AOAM533WnMnZXEXgrV4QrOlxzDdCo9dVkoDbZ6IS3Sn3YHHt7Xy4ghHy qgInrf28ptoP0l3Q+/Xq7dCLYLLAI9eTGg== X-Google-Smtp-Source: ABdhPJythBPVclnismDL0vpbFN2usEBpFfnWEI5nfFoGbcbEuhASqMmeLKICy50K55RnxoZ74dmglA== X-Received: by 2002:a05:6512:c12:: with SMTP id z18mr1512005lfu.335.1631742069018; Wed, 15 Sep 2021 14:41:09 -0700 (PDT) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id o4sm85989lfi.16.2021.09.15.14.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 14:41:06 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Kozlyuk , Ferruh Yigit , Narcisa Ana Maria Vasile , Olivier Matz , Pallavi Kadam , Ray Kinsella , Tyler Retzlaff Date: Thu, 16 Sep 2021 00:40:52 +0300 Message-Id: <20210915214052.143098-6-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> References: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 5/5] net: rename Ethernet header fields X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Definition of `rte_ether_addr` structure used a workaround allowing DPDK and Windows SDK headers to be used in the same file, because Windows SDK defines `s_addr` as a macro. Rename `s_addr` to `src_addr` and `d_addr` to `dst_addr` to avoid the conflict and remove the workaround. Deprecation notice: https://mails.dpdk.org/archives/dev/2021-July/215270.html Signed-off-by: Dmitry Kozlyuk --- app/test-pmd/5tswap.c | 6 +-- app/test-pmd/csumonly.c | 4 +- app/test-pmd/flowgen.c | 4 +- app/test-pmd/icmpecho.c | 16 ++++---- app/test-pmd/ieee1588fwd.c | 6 +-- app/test-pmd/macfwd.c | 4 +- app/test-pmd/macswap.h | 4 +- app/test-pmd/txonly.c | 4 +- app/test-pmd/util.c | 4 +- app/test/packet_burst_generator.c | 4 +- app/test/test_bpf.c | 4 +- app/test/test_link_bonding_mode4.c | 15 +++---- doc/guides/rel_notes/deprecation.rst | 3 -- doc/guides/rel_notes/release_20_11.rst | 3 ++ drivers/net/avp/avp_ethdev.c | 6 +-- drivers/net/bnx2x/bnx2x.c | 16 ++++---- drivers/net/bonding/rte_eth_bond_8023ad.c | 6 +-- drivers/net/bonding/rte_eth_bond_alb.c | 4 +- drivers/net/bonding/rte_eth_bond_pmd.c | 22 +++++----- drivers/net/enic/enic_flow.c | 8 ++-- drivers/net/mlx5/mlx5_txpp.c | 4 +- examples/bond/main.c | 14 ++++--- examples/ethtool/ethtool-app/main.c | 4 +- examples/eventdev_pipeline/pipeline_common.h | 4 +- examples/flow_filtering/main.c | 4 +- examples/ioat/ioatfwd.c | 4 +- examples/ip_fragmentation/main.c | 4 +- examples/ip_reassembly/main.c | 4 +- examples/ipsec-secgw/ipsec-secgw.c | 4 +- examples/ipsec-secgw/ipsec_worker.c | 4 +- examples/ipv4_multicast/main.c | 4 +- examples/l2fwd-crypto/main.c | 4 +- examples/l2fwd-event/l2fwd_common.h | 4 +- examples/l2fwd-jobstats/main.c | 4 +- examples/l2fwd-keepalive/main.c | 4 +- examples/l2fwd/main.c | 4 +- examples/l3fwd-acl/main.c | 19 +++++---- examples/l3fwd-power/main.c | 6 +-- examples/l3fwd/l3fwd_em.h | 4 +- examples/l3fwd/l3fwd_fib.c | 2 +- examples/l3fwd/l3fwd_lpm.c | 2 +- examples/l3fwd/l3fwd_lpm.h | 4 +- examples/link_status_interrupt/main.c | 4 +- .../performance-thread/l3fwd-thread/main.c | 40 +++++++++---------- examples/ptpclient/ptpclient.c | 16 ++++---- examples/vhost/main.c | 10 ++--- examples/vmdq/main.c | 4 +- examples/vmdq_dcb/main.c | 4 +- lib/ethdev/rte_flow.h | 4 +- lib/gro/gro_tcp4.c | 4 +- lib/gro/gro_udp4.c | 4 +- lib/gro/gro_vxlan_tcp4.c | 8 ++-- lib/gro/gro_vxlan_udp4.c | 8 ++-- lib/net/rte_arp.c | 4 +- lib/net/rte_ether.h | 22 +--------- lib/pipeline/rte_table_action.c | 40 +++++++++---------- 56 files changed, 207 insertions(+), 219 deletions(-) diff --git a/app/test-pmd/5tswap.c b/app/test-pmd/5tswap.c index e8cef9623b..629d3e0d31 100644 --- a/app/test-pmd/5tswap.c +++ b/app/test-pmd/5tswap.c @@ -27,9 +27,9 @@ swap_mac(struct rte_ether_hdr *eth_hdr) struct rte_ether_addr addr; /* Swap dest and src mac addresses. */ - rte_ether_addr_copy(ð_hdr->d_addr, &addr); - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->dst_addr, &addr); + rte_ether_addr_copy(ð_hdr->src_addr, ð_hdr->dst_addr); + rte_ether_addr_copy(&addr, ð_hdr->src_addr); } static inline void diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 38cc256533..090797318a 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -873,9 +873,9 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], - ð_hdr->d_addr); + ð_hdr->dst_addr); rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, - ð_hdr->s_addr); + ð_hdr->src_addr); parse_ethernet(eth_hdr, &info); l3_hdr = (char *)eth_hdr + info.l2_len; diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 9348618d0f..3f3378a444 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -123,8 +123,8 @@ pkt_burst_flow_gen(struct fwd_stream *fs) /* Initialize Ethernet header. */ eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->d_addr); - rte_ether_addr_copy(&cfg_ether_src, ð_hdr->s_addr); + rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->dst_addr); + rte_ether_addr_copy(&cfg_ether_src, ð_hdr->src_addr); eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); /* Initialize IP header. */ diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c index 8948f28eb5..8f1d68a83a 100644 --- a/app/test-pmd/icmpecho.c +++ b/app/test-pmd/icmpecho.c @@ -319,8 +319,8 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) if (verbose_level > 0) { printf("\nPort %d pkt-len=%u nb-segs=%u\n", fs->rx_port, pkt->pkt_len, pkt->nb_segs); - ether_addr_dump(" ETH: src=", ð_h->s_addr); - ether_addr_dump(" dst=", ð_h->d_addr); + ether_addr_dump(" ETH: src=", ð_h->src_addr); + ether_addr_dump(" dst=", ð_h->dst_addr); } if (eth_type == RTE_ETHER_TYPE_VLAN) { vlan_h = (struct rte_vlan_hdr *) @@ -385,17 +385,17 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) */ /* Use source MAC address as destination MAC address. */ - rte_ether_addr_copy(ð_h->s_addr, ð_h->d_addr); + rte_ether_addr_copy(ð_h->src_addr, ð_h->dst_addr); /* Set source MAC address with MAC address of TX port */ rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, - ð_h->s_addr); + ð_h->src_addr); arp_h->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY); rte_ether_addr_copy(&arp_h->arp_data.arp_tha, ð_addr); rte_ether_addr_copy(&arp_h->arp_data.arp_sha, &arp_h->arp_data.arp_tha); - rte_ether_addr_copy(ð_h->s_addr, + rte_ether_addr_copy(ð_h->src_addr, &arp_h->arp_data.arp_sha); /* Swap IP addresses in ARP payload */ @@ -453,9 +453,9 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) * ICMP checksum is computed by assuming it is valid in the * echo request and not verified. */ - rte_ether_addr_copy(ð_h->s_addr, ð_addr); - rte_ether_addr_copy(ð_h->d_addr, ð_h->s_addr); - rte_ether_addr_copy(ð_addr, ð_h->d_addr); + rte_ether_addr_copy(ð_h->src_addr, ð_addr); + rte_ether_addr_copy(ð_h->dst_addr, ð_h->src_addr); + rte_ether_addr_copy(ð_addr, ð_h->dst_addr); ip_addr = ip_h->src_addr; if (is_multicast_ipv4_addr(ip_h->dst_addr)) { uint32_t ip_src; diff --git a/app/test-pmd/ieee1588fwd.c b/app/test-pmd/ieee1588fwd.c index 034f238c34..9cf10c1c50 100644 --- a/app/test-pmd/ieee1588fwd.c +++ b/app/test-pmd/ieee1588fwd.c @@ -178,9 +178,9 @@ ieee1588_packet_fwd(struct fwd_stream *fs) port_ieee1588_rx_timestamp_check(fs->rx_port, timesync_index); /* Swap dest and src mac addresses. */ - rte_ether_addr_copy(ð_hdr->d_addr, &addr); - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->dst_addr, &addr); + rte_ether_addr_copy(ð_hdr->src_addr, ð_hdr->dst_addr); + rte_ether_addr_copy(&addr, ð_hdr->src_addr); /* Forward PTP packet with hardware TX timestamp */ mb->ol_flags |= PKT_TX_IEEE1588_TMST; diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c index 0568ea794d..ee76df7f03 100644 --- a/app/test-pmd/macfwd.c +++ b/app/test-pmd/macfwd.c @@ -85,9 +85,9 @@ pkt_burst_mac_forward(struct fwd_stream *fs) mb = pkts_burst[i]; eth_hdr = rte_pktmbuf_mtod(mb, struct rte_ether_hdr *); rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], - ð_hdr->d_addr); + ð_hdr->dst_addr); rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, - ð_hdr->s_addr); + ð_hdr->src_addr); mb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF; mb->ol_flags |= ol_flags; mb->l2_len = sizeof(struct rte_ether_hdr); diff --git a/app/test-pmd/macswap.h b/app/test-pmd/macswap.h index 0138441566..20823b9b8c 100644 --- a/app/test-pmd/macswap.h +++ b/app/test-pmd/macswap.h @@ -30,8 +30,8 @@ do_macswap(struct rte_mbuf *pkts[], uint16_t nb, /* Swap dest and src mac addresses. */ rte_ether_addr_copy(ð_hdr->d_addr, &addr); - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->src_addr, ð_hdr->d_addr); + rte_ether_addr_copy(&addr, ð_hdr->src_addr); mbuf_field_set(mb, ol_flags); } diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c index aed820f5d3..40655801cc 100644 --- a/app/test-pmd/txonly.c +++ b/app/test-pmd/txonly.c @@ -362,8 +362,8 @@ pkt_burst_transmit(struct fwd_stream *fs) /* * Initialize Ethernet header. */ - rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], ð_hdr.d_addr); - rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, ð_hdr.s_addr); + rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], ð_hdr.dst_addr); + rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, ð_hdr.src_addr); eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); if (rte_mempool_get_bulk(mbp, (void **)pkts_burst, diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 14a9a251fb..51506e4940 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -142,9 +142,9 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], " - no miss group"); MKDUMPSTR(print_buf, buf_size, cur_len, "\n"); } - print_ether_addr(" src=", ð_hdr->s_addr, + print_ether_addr(" src=", ð_hdr->src_addr, print_buf, buf_size, &cur_len); - print_ether_addr(" - dst=", ð_hdr->d_addr, + print_ether_addr(" - dst=", ð_hdr->dst_addr, print_buf, buf_size, &cur_len); MKDUMPSTR(print_buf, buf_size, cur_len, " - type=0x%04x - length=%u - nb_segs=%d", diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c index 0fd7290b0e..8ac24577ba 100644 --- a/app/test/packet_burst_generator.c +++ b/app/test/packet_burst_generator.c @@ -56,8 +56,8 @@ initialize_eth_header(struct rte_ether_hdr *eth_hdr, struct rte_ether_addr *dst_mac, uint16_t ether_type, uint8_t vlan_enabled, uint16_t van_id) { - rte_ether_addr_copy(dst_mac, ð_hdr->d_addr); - rte_ether_addr_copy(src_mac, ð_hdr->s_addr); + rte_ether_addr_copy(dst_mac, ð_hdr->dst_addr); + rte_ether_addr_copy(src_mac, ð_hdr->src_addr); if (vlan_enabled) { struct rte_vlan_hdr *vhdr = (struct rte_vlan_hdr *)( diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index 527c06b807..8118a1849b 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -1008,9 +1008,9 @@ test_jump2_prepare(void *arg) * Initialize ether header. */ rte_ether_addr_copy((struct rte_ether_addr *)dst_mac, - &dn->eth_hdr.d_addr); + &dn->eth_hdr.dst_addr); rte_ether_addr_copy((struct rte_ether_addr *)src_mac, - &dn->eth_hdr.s_addr); + &dn->eth_hdr.src_addr); dn->eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); /* diff --git a/app/test/test_link_bonding_mode4.c b/app/test/test_link_bonding_mode4.c index 2c835fa7ad..f120b2e3be 100644 --- a/app/test/test_link_bonding_mode4.c +++ b/app/test/test_link_bonding_mode4.c @@ -502,8 +502,8 @@ make_lacp_reply(struct slave_conf *slave, struct rte_mbuf *pkt) slow_hdr = rte_pktmbuf_mtod(pkt, struct slow_protocol_frame *); /* Change source address to partner address */ - rte_ether_addr_copy(&parnter_mac_default, &slow_hdr->eth_hdr.s_addr); - slow_hdr->eth_hdr.s_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = + rte_ether_addr_copy(&parnter_mac_default, &slow_hdr->eth_hdr.src_addr); + slow_hdr->eth_hdr.src_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = slave->port_id; lacp = (struct lacpdu *) &slow_hdr->slow_protocol; @@ -870,7 +870,7 @@ test_mode4_rx(void) for (i = 0; i < expected_pkts_cnt; i++) { hdr = rte_pktmbuf_mtod(pkts[i], struct rte_ether_hdr *); - cnt[rte_is_same_ether_addr(&hdr->d_addr, + cnt[rte_is_same_ether_addr(&hdr->dst_addr, &bonded_mac)]++; } @@ -918,7 +918,7 @@ test_mode4_rx(void) for (i = 0; i < expected_pkts_cnt; i++) { hdr = rte_pktmbuf_mtod(pkts[i], struct rte_ether_hdr *); - eq_cnt += rte_is_same_ether_addr(&hdr->d_addr, + eq_cnt += rte_is_same_ether_addr(&hdr->dst_addr, &bonded_mac); } @@ -1163,11 +1163,12 @@ init_marker(struct rte_mbuf *pkt, struct slave_conf *slave) /* Copy multicast destination address */ rte_ether_addr_copy(&slow_protocol_mac_addr, - &marker_hdr->eth_hdr.d_addr); + &marker_hdr->eth_hdr.dst_addr); /* Init source address */ - rte_ether_addr_copy(&parnter_mac_default, &marker_hdr->eth_hdr.s_addr); - marker_hdr->eth_hdr.s_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = + rte_ether_addr_copy(&parnter_mac_default, + &marker_hdr->eth_hdr.src_addr); + marker_hdr->eth_hdr.src_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = slave->port_id; marker_hdr->eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_SLOW); diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 6d48155b35..3ae713edae 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -172,9 +172,6 @@ Deprecation Notices can still be used if users specify the devarg "driver=i40evf". I40evf will be deleted in DPDK 21.11. -* net: ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure - will be renamed in DPDK 21.11 to avoid conflict with Windows Sockets headers. - * net: The structure ``rte_ipv4_hdr`` will have two unions. The first union is for existing ``version_ihl`` byte and new bitfield for version and IHL. diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index 3eb30f855c..51e85a7279 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -668,6 +668,9 @@ API Changes * cryptodev: Renamed ``min`` and ``max`` fields of ``rte_crypto_param_range`` structure to ``minimum`` and ``maximum``, respectively. +* net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure + to ``src_addr`` and ``dst_addr``, respectively. + ABI Changes ----------- diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c index 623fa5e5ff..b5fafd32b0 100644 --- a/drivers/net/avp/avp_ethdev.c +++ b/drivers/net/avp/avp_ethdev.c @@ -1205,17 +1205,17 @@ _avp_mac_filter(struct avp_dev *avp, struct rte_mbuf *m) { struct rte_ether_hdr *eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - if (likely(_avp_cmp_ether_addr(&avp->ethaddr, ð->d_addr) == 0)) { + if (likely(_avp_cmp_ether_addr(&avp->ethaddr, ð->dst_addr) == 0)) { /* allow all packets destined to our address */ return 0; } - if (likely(rte_is_broadcast_ether_addr(ð->d_addr))) { + if (likely(rte_is_broadcast_ether_addr(ð->dst_addr))) { /* allow all broadcast packets */ return 0; } - if (likely(rte_is_multicast_ether_addr(ð->d_addr))) { + if (likely(rte_is_multicast_ether_addr(ð->dst_addr))) { /* allow all multicast packets */ return 0; } diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 7ee805bd0d..2d0403e593 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -2233,8 +2233,8 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0) tx_parse_bd = &txq->tx_ring[TX_BD(bd_prod, txq)].parse_bd_e2; - if (rte_is_multicast_ether_addr(&eh->d_addr)) { - if (rte_is_broadcast_ether_addr(&eh->d_addr)) + if (rte_is_multicast_ether_addr(&eh->dst_addr)) { + if (rte_is_broadcast_ether_addr(&eh->dst_addr)) mac_type = BROADCAST_ADDRESS; else mac_type = MULTICAST_ADDRESS; @@ -2243,17 +2243,17 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0) (mac_type << ETH_TX_PARSE_BD_E2_ETH_ADDR_TYPE_SHIFT); rte_memcpy(&tx_parse_bd->data.mac_addr.dst_hi, - &eh->d_addr.addr_bytes[0], 2); + &eh->dst_addr.addr_bytes[0], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.dst_mid, - &eh->d_addr.addr_bytes[2], 2); + &eh->dst_addr.addr_bytes[2], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.dst_lo, - &eh->d_addr.addr_bytes[4], 2); + &eh->dst_addr.addr_bytes[4], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.src_hi, - &eh->s_addr.addr_bytes[0], 2); + &eh->src_addr.addr_bytes[0], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.src_mid, - &eh->s_addr.addr_bytes[2], 2); + &eh->src_addr.addr_bytes[2], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.src_lo, - &eh->s_addr.addr_bytes[4], 2); + &eh->src_addr.addr_bytes[4], 2); tx_parse_bd->data.mac_addr.dst_hi = rte_cpu_to_be_16(tx_parse_bd->data.mac_addr.dst_hi); diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 128754f459..ce911f0f90 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -587,8 +587,8 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id) hdr = rte_pktmbuf_mtod(lacp_pkt, struct lacpdu_header *); /* Source and destination MAC */ - rte_ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.d_addr); - rte_eth_macaddr_get(slave_id, &hdr->eth_hdr.s_addr); + rte_ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.dst_addr); + rte_eth_macaddr_get(slave_id, &hdr->eth_hdr.src_addr); hdr->eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_SLOW); lacpdu = &hdr->lacpdu; @@ -1346,7 +1346,7 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals, } while (unlikely(retval == 0)); m_hdr->marker.tlv_type_marker = MARKER_TLV_TYPE_RESP; - rte_eth_macaddr_get(slave_id, &m_hdr->eth_hdr.s_addr); + rte_eth_macaddr_get(slave_id, &m_hdr->eth_hdr.src_addr); if (internals->mode4.dedicated_queues.enabled == 0) { if (rte_ring_enqueue(port->tx_ring, pkt) != 0) { diff --git a/drivers/net/bonding/rte_eth_bond_alb.c b/drivers/net/bonding/rte_eth_bond_alb.c index 1d36a4a4a2..86335a7971 100644 --- a/drivers/net/bonding/rte_eth_bond_alb.c +++ b/drivers/net/bonding/rte_eth_bond_alb.c @@ -213,8 +213,8 @@ bond_mode_alb_arp_upd(struct client_data *client_info, rte_spinlock_lock(&internals->mode6.lock); eth_h = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(&client_info->app_mac, ð_h->s_addr); - rte_ether_addr_copy(&client_info->cli_mac, ð_h->d_addr); + rte_ether_addr_copy(&client_info->app_mac, ð_h->src_addr); + rte_ether_addr_copy(&client_info->cli_mac, ð_h->dst_addr); if (client_info->vlan_count > 0) eth_h->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); else diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index a6755661c4..b7f9cfcfa3 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -342,11 +342,11 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, bufs[j])) || !collecting || (!promisc && - ((rte_is_unicast_ether_addr(&hdr->d_addr) && + ((rte_is_unicast_ether_addr(&hdr->dst_addr) && !rte_is_same_ether_addr(bond_mac, - &hdr->d_addr)) || + &hdr->dst_addr)) || (!allmulti && - rte_is_multicast_ether_addr(&hdr->d_addr)))))) { + rte_is_multicast_ether_addr(&hdr->dst_addr)))))) { if (hdr->ether_type == ether_type_slow_be) { bond_mode_8023ad_handle_slow_pkt( @@ -477,9 +477,9 @@ update_client_stats(uint32_t addr, uint16_t port, uint32_t *TXorRXindicator) "DstMAC:%02X:%02X:%02X:%02X:%02X:%02X DstIP:%s %s %d\n", \ info, \ port, \ - eth_h->s_addr.addr_bytes[0], eth_h->s_addr.addr_bytes[1], \ - eth_h->s_addr.addr_bytes[2], eth_h->s_addr.addr_bytes[3], \ - eth_h->s_addr.addr_bytes[4], eth_h->s_addr.addr_bytes[5], \ + eth_h->src_addr.addr_bytes[0], eth_h->src_addr.addr_bytes[1], \ + eth_h->src_addr.addr_bytes[2], eth_h->src_addr.addr_bytes[3], \ + eth_h->src_addr.addr_bytes[4], eth_h->src_addr.addr_bytes[5], \ src_ip, \ eth_h->d_addr.addr_bytes[0], eth_h->d_addr.addr_bytes[1], \ eth_h->d_addr.addr_bytes[2], eth_h->d_addr.addr_bytes[3], \ @@ -647,9 +647,9 @@ static inline uint16_t ether_hash(struct rte_ether_hdr *eth_hdr) { unaligned_uint16_t *word_src_addr = - (unaligned_uint16_t *)eth_hdr->s_addr.addr_bytes; + (unaligned_uint16_t *)eth_hdr->src_addr.addr_bytes; unaligned_uint16_t *word_dst_addr = - (unaligned_uint16_t *)eth_hdr->d_addr.addr_bytes; + (unaligned_uint16_t *)eth_hdr->dst_addr.addr_bytes; return (word_src_addr[0] ^ word_dst_addr[0]) ^ (word_src_addr[1] ^ word_dst_addr[1]) ^ @@ -946,10 +946,10 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) ether_hdr = rte_pktmbuf_mtod(bufs[j], struct rte_ether_hdr *); - if (rte_is_same_ether_addr(ðer_hdr->s_addr, + if (rte_is_same_ether_addr(ðer_hdr->src_addr, &primary_slave_addr)) rte_ether_addr_copy(&active_slave_addr, - ðer_hdr->s_addr); + ðer_hdr->src_addr); #if defined(RTE_LIBRTE_BOND_DEBUG_ALB) || defined(RTE_LIBRTE_BOND_DEBUG_ALB_L1) mode6_debug("TX IPv4:", ether_hdr, slaves[i], &burstnumberTX); #endif @@ -1021,7 +1021,7 @@ bond_ethdev_tx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) slave_idx = bond_mode_alb_arp_xmit(eth_h, offset, internals); /* Change src mac in eth header */ - rte_eth_macaddr_get(slave_idx, ð_h->s_addr); + rte_eth_macaddr_get(slave_idx, ð_h->src_addr); /* Add packet to slave tx buffer */ slave_bufs[slave_idx][slave_bufs_pkts[slave_idx]] = bufs[i]; diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c index cdfdc904a6..33147169ba 100644 --- a/drivers/net/enic/enic_flow.c +++ b/drivers/net/enic/enic_flow.c @@ -656,14 +656,14 @@ enic_copy_item_eth_v2(struct copy_item_args *arg) if (!mask) mask = &rte_flow_item_eth_mask; - memcpy(enic_spec.d_addr.addr_bytes, spec->dst.addr_bytes, + memcpy(enic_spec.dst_addr.addr_bytes, spec->dst.addr_bytes, RTE_ETHER_ADDR_LEN); - memcpy(enic_spec.s_addr.addr_bytes, spec->src.addr_bytes, + memcpy(enic_spec.src_addr.addr_bytes, spec->src.addr_bytes, RTE_ETHER_ADDR_LEN); - memcpy(enic_mask.d_addr.addr_bytes, mask->dst.addr_bytes, + memcpy(enic_mask.dst_addr.addr_bytes, mask->dst.addr_bytes, RTE_ETHER_ADDR_LEN); - memcpy(enic_mask.s_addr.addr_bytes, mask->src.addr_bytes, + memcpy(enic_mask.src_addr.addr_bytes, mask->src.addr_bytes, RTE_ETHER_ADDR_LEN); enic_spec.ether_type = spec->type; enic_mask.ether_type = mask->type; diff --git a/drivers/net/mlx5/mlx5_txpp.c b/drivers/net/mlx5/mlx5_txpp.c index 4f6da9f2d1..2be7e71f89 100644 --- a/drivers/net/mlx5/mlx5_txpp.c +++ b/drivers/net/mlx5/mlx5_txpp.c @@ -333,8 +333,8 @@ mlx5_txpp_fill_wqe_clock_queue(struct mlx5_dev_ctx_shared *sh) /* Build test packet L2 header (Ethernet). */ dst = (uint8_t *)&es->inline_data; eth_hdr = (struct rte_ether_hdr *)dst; - rte_eth_random_addr(ð_hdr->d_addr.addr_bytes[0]); - rte_eth_random_addr(ð_hdr->s_addr.addr_bytes[0]); + rte_eth_random_addr(ð_hdr->dst_addr.addr_bytes[0]); + rte_eth_random_addr(ð_hdr->src_addr.addr_bytes[0]); eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); /* Build test packet L3 header (IP v4). */ dst += sizeof(struct rte_ether_hdr); diff --git a/examples/bond/main.c b/examples/bond/main.c index f48400e211..c51892b6f0 100644 --- a/examples/bond/main.c +++ b/examples/bond/main.c @@ -423,8 +423,8 @@ static int lcore_main(__rte_unused void *arg1) if (arp_hdr->arp_opcode == rte_cpu_to_be_16(RTE_ARP_OP_REQUEST)) { arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY); /* Switch src and dst data and set bonding MAC */ - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&bond_mac_addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->src_addr, ð_hdr->dst_addr); + rte_ether_addr_copy(&bond_mac_addr, ð_hdr->src_addr); rte_ether_addr_copy(&arp_hdr->arp_data.arp_sha, &arp_hdr->arp_data.arp_tha); arp_hdr->arp_data.arp_tip = arp_hdr->arp_data.arp_sip; @@ -444,8 +444,10 @@ static int lcore_main(__rte_unused void *arg1) } ipv4_hdr = (struct rte_ipv4_hdr *)((char *)(eth_hdr + 1) + offset); if (ipv4_hdr->dst_addr == bond_ip) { - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&bond_mac_addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->src_addr, + ð_hdr->dst_addr); + rte_ether_addr_copy(&bond_mac_addr, + ð_hdr->src_addr); ipv4_hdr->dst_addr = ipv4_hdr->src_addr; ipv4_hdr->src_addr = bond_ip; rte_eth_tx_burst(BOND_PORT, 0, &pkts[i], 1); @@ -520,8 +522,8 @@ static void cmd_obj_send_parsed(void *parsed_result, created_pkt->pkt_len = pkt_size; eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(&bond_mac_addr, ð_hdr->s_addr); - memset(ð_hdr->d_addr, 0xFF, RTE_ETHER_ADDR_LEN); + rte_ether_addr_copy(&bond_mac_addr, ð_hdr->src_addr); + memset(ð_hdr->dst_addr, 0xFF, RTE_ETHER_ADDR_LEN); eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP); arp_hdr = (struct rte_arp_hdr *)( diff --git a/examples/ethtool/ethtool-app/main.c b/examples/ethtool/ethtool-app/main.c index 21ed85c7d6..1bc675962b 100644 --- a/examples/ethtool/ethtool-app/main.c +++ b/examples/ethtool/ethtool-app/main.c @@ -172,8 +172,8 @@ static void process_frame(struct app_port *ptr_port, struct rte_ether_hdr *ptr_mac_hdr; ptr_mac_hdr = rte_pktmbuf_mtod(ptr_frame, struct rte_ether_hdr *); - rte_ether_addr_copy(&ptr_mac_hdr->s_addr, &ptr_mac_hdr->d_addr); - rte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->s_addr); + rte_ether_addr_copy(&ptr_mac_hdr->src_addr, &ptr_mac_hdr->dst_addr); + rte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->src_addr); } static int worker_main(__rte_unused void *ptr_data) diff --git a/examples/eventdev_pipeline/pipeline_common.h b/examples/eventdev_pipeline/pipeline_common.h index 6a4287602e..b12eb281e1 100644 --- a/examples/eventdev_pipeline/pipeline_common.h +++ b/examples/eventdev_pipeline/pipeline_common.h @@ -104,8 +104,8 @@ exchange_mac(struct rte_mbuf *m) /* change mac addresses on packet (to use mbuf data) */ eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - rte_ether_addr_copy(ð->d_addr, &addr); - rte_ether_addr_copy(&addr, ð->d_addr); + rte_ether_addr_copy(ð->dst_addr, &addr); + rte_ether_addr_copy(&addr, ð->dst_addr); } static __rte_always_inline void diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c index 29fb4b3d55..dd8a33d036 100644 --- a/examples/flow_filtering/main.c +++ b/examples/flow_filtering/main.c @@ -75,9 +75,9 @@ main_loop(void) eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); print_ether_addr("src=", - ð_hdr->s_addr); + ð_hdr->src_addr); print_ether_addr(" - dst=", - ð_hdr->d_addr); + ð_hdr->dst_addr); printf(" - queue=0x%x", (unsigned int)i); printf("\n"); diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c index 0c413180f8..7824247d69 100644 --- a/examples/ioat/ioatfwd.c +++ b/examples/ioat/ioatfwd.c @@ -322,11 +322,11 @@ update_mac_addrs(struct rte_mbuf *m, uint32_t dest_portid) /* 02:00:00:00:00:xx - overwriting 2 bytes of source address but * it's acceptable cause it gets overwritten by rte_ether_addr_copy */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40); /* src addr */ - rte_ether_addr_copy(&ioat_ports_eth_addr[dest_portid], ð->s_addr); + rte_ether_addr_copy(&ioat_ports_eth_addr[dest_portid], ð->src_addr); } /* Perform packet copy there is a user-defined function. 8< */ diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index f245369720..a7f40970f2 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -362,13 +362,13 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, m->l2_len = sizeof(struct rte_ether_hdr); /* 02:00:00:00:00:xx */ - d_addr_bytes = ð_hdr->d_addr.addr_bytes[0]; + d_addr_bytes = ð_hdr->dst_addr.addr_bytes[0]; *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)port_out << 40); /* src addr */ rte_ether_addr_copy(&ports_eth_addr[port_out], - ð_hdr->s_addr); + ð_hdr->src_addr); eth_hdr->ether_type = ether_type; } diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 8645ac790b..d611c7d016 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -413,11 +413,11 @@ reassemble(struct rte_mbuf *m, uint16_t portid, uint32_t queue, /* if packet wasn't IPv4 or IPv6, it's forwarded to the port it came from */ /* 02:00:00:00:00:xx */ - d_addr_bytes = ð_hdr->d_addr.addr_bytes[0]; + d_addr_bytes = ð_hdr->dst_addr.addr_bytes[0]; *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&ports_eth_addr[dst_port], ð_hdr->s_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port], ð_hdr->src_addr); send_single_packet(m, dst_port); } diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index f252d34985..61987c513e 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -545,9 +545,9 @@ prepare_tx_pkt(struct rte_mbuf *pkt, uint16_t port, ethhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); } - memcpy(ðhdr->s_addr, ðaddr_tbl[port].src, + memcpy(ðhdr->src_addr, ðaddr_tbl[port].src, sizeof(struct rte_ether_addr)); - memcpy(ðhdr->d_addr, ðaddr_tbl[port].dst, + memcpy(ðhdr->dst_addr, ðaddr_tbl[port].dst, sizeof(struct rte_ether_addr)); } diff --git a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c index 647e22df59..996b0acd03 100644 --- a/examples/ipsec-secgw/ipsec_worker.c +++ b/examples/ipsec-secgw/ipsec_worker.c @@ -44,8 +44,8 @@ update_mac_addrs(struct rte_mbuf *pkt, uint16_t portid) struct rte_ether_hdr *ethhdr; ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); - memcpy(ðhdr->s_addr, ðaddr_tbl[portid].src, RTE_ETHER_ADDR_LEN); - memcpy(ðhdr->d_addr, ðaddr_tbl[portid].dst, RTE_ETHER_ADDR_LEN); + memcpy(ðhdr->src_addr, ðaddr_tbl[portid].src, RTE_ETHER_ADDR_LEN); + memcpy(ðhdr->dst_addr, ðaddr_tbl[portid].dst, RTE_ETHER_ADDR_LEN); } static inline void diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index cc527d7f6b..d10de30ddb 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -283,8 +283,8 @@ mcast_send_pkt(struct rte_mbuf *pkt, struct rte_ether_addr *dest_addr, rte_pktmbuf_prepend(pkt, (uint16_t)sizeof(*ethdr)); RTE_ASSERT(ethdr != NULL); - rte_ether_addr_copy(dest_addr, ðdr->d_addr); - rte_ether_addr_copy(&ports_eth_addr[port], ðdr->s_addr); + rte_ether_addr_copy(dest_addr, ðdr->dst_addr); + rte_ether_addr_copy(&ports_eth_addr[port], ðdr->src_addr); ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4); /* Put new packet into the output queue */ diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index b6bc371bd2..96636e84ce 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -617,11 +617,11 @@ l2fwd_mac_updating(struct rte_mbuf *m, uint16_t dest_portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40); /* src addr */ - rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->s_addr); + rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->src_addr); } static void diff --git a/examples/l2fwd-event/l2fwd_common.h b/examples/l2fwd-event/l2fwd_common.h index 939221d45a..cecbd9b70e 100644 --- a/examples/l2fwd-event/l2fwd_common.h +++ b/examples/l2fwd-event/l2fwd_common.h @@ -92,11 +92,11 @@ l2fwd_mac_updating(struct rte_mbuf *m, uint32_t dest_port_id, eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_port_id << 40); /* src addr */ - rte_ether_addr_copy(addr, ð->s_addr); + rte_ether_addr_copy(addr, ð->src_addr); } static __rte_always_inline struct l2fwd_resources * diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c index bbb4a27a6d..117e06d712 100644 --- a/examples/l2fwd-jobstats/main.c +++ b/examples/l2fwd-jobstats/main.c @@ -351,11 +351,11 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->src_addr); buffer = tx_buffer[dst_port]; sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c index 4e1a17cfe4..efdfa4d89c 100644 --- a/examples/l2fwd-keepalive/main.c +++ b/examples/l2fwd-keepalive/main.c @@ -177,11 +177,11 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->src_addr); buffer = tx_buffer[dst_port]; sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 911e40c66e..48c2a3da12 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -170,11 +170,11 @@ l2fwd_mac_updating(struct rte_mbuf *m, unsigned dest_portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40); /* src addr */ - rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->s_addr); + rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->src_addr); } /* Simple forward. 8< */ diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index a1f457b564..60545f3059 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -1375,7 +1375,8 @@ send_single_packet(struct rte_mbuf *m, uint16_t port) /* update src and dst mac*/ eh = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - memcpy(eh, &port_l2hdr[port], sizeof(eh->d_addr) + sizeof(eh->s_addr)); + memcpy(eh, &port_l2hdr[port], + sizeof(eh->dst_addr) + sizeof(eh->src_addr)); qconf = &lcore_conf[lcore_id]; rte_eth_tx_buffer(port, qconf->tx_queue_id[port], @@ -1743,8 +1744,9 @@ parse_eth_dest(const char *optarg) return "port value exceeds RTE_MAX_ETHPORTS(" RTE_STR(RTE_MAX_ETHPORTS) ")"; - if (cmdline_parse_etheraddr(NULL, port_end, &port_l2hdr[portid].d_addr, - sizeof(port_l2hdr[portid].d_addr)) < 0) + if (cmdline_parse_etheraddr(NULL, port_end, + &port_l2hdr[portid].dst_addr, + sizeof(port_l2hdr[portid].dst_addr)) < 0) return "Invalid ethernet address"; return NULL; } @@ -2002,8 +2004,9 @@ set_default_dest_mac(void) uint32_t i; for (i = 0; i != RTE_DIM(port_l2hdr); i++) { - port_l2hdr[i].d_addr.addr_bytes[0] = RTE_ETHER_LOCAL_ADMIN_ADDR; - port_l2hdr[i].d_addr.addr_bytes[5] = i; + port_l2hdr[i].dst_addr.addr_bytes[0] = + RTE_ETHER_LOCAL_ADMIN_ADDR; + port_l2hdr[i].dst_addr.addr_bytes[5] = i; } } @@ -2109,14 +2112,14 @@ main(int argc, char **argv) "rte_eth_dev_adjust_nb_rx_tx_desc: err=%d, port=%d\n", ret, portid); - ret = rte_eth_macaddr_get(portid, &port_l2hdr[portid].s_addr); + ret = rte_eth_macaddr_get(portid, &port_l2hdr[portid].src_addr); if (ret < 0) rte_exit(EXIT_FAILURE, "rte_eth_macaddr_get: err=%d, port=%d\n", ret, portid); - print_ethaddr("Dst MAC:", &port_l2hdr[portid].d_addr); - print_ethaddr(", Src MAC:", &port_l2hdr[portid].s_addr); + print_ethaddr("Dst MAC:", &port_l2hdr[portid].dst_addr); + print_ethaddr(", Src MAC:", &port_l2hdr[portid].src_addr); printf(", "); /* init memory */ diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index aa7b8db44a..90456f8f33 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -717,7 +717,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid, dst_port = portid; /* 02:00:00:00:00:xx */ - d_addr_bytes = ð_hdr->d_addr.addr_bytes[0]; + d_addr_bytes = ð_hdr->dst_addr.addr_bytes[0]; *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)dst_port << 40); @@ -729,7 +729,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(m, dst_port); } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { @@ -755,7 +755,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(m, dst_port); #else diff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h index b992a21da4..1eff591b48 100644 --- a/examples/l3fwd/l3fwd_em.h +++ b/examples/l3fwd/l3fwd_em.h @@ -40,7 +40,7 @@ l3fwd_em_handle_ipv4(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); return dst_port; } @@ -68,7 +68,7 @@ l3fwd_em_handle_ipv6(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); return dst_port; } diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c index f8d6a3ac39..c594877d96 100644 --- a/examples/l3fwd/l3fwd_fib.c +++ b/examples/l3fwd/l3fwd_fib.c @@ -94,7 +94,7 @@ fib_send_single(int nb_tx, struct lcore_conf *qconf, struct rte_ether_hdr *); *(uint64_t *)ð_hdr->d_addr = dest_eth_addr[hops[j]]; rte_ether_addr_copy(&ports_eth_addr[hops[j]], - ð_hdr->s_addr); + ð_hdr->src_addr); /* Send single packet. */ send_single_packet(qconf, pkts_burst[j], hops[j]); diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index 7200160164..227a6d7fa5 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -260,7 +260,7 @@ lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf) /* src addr */ rte_ether_addr_copy(&ports_eth_addr[mbuf->port], - ð_hdr->s_addr); + ð_hdr->src_addr); #endif return mbuf->port; } diff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h index d730d72a20..dd2eae18b8 100644 --- a/examples/l3fwd/l3fwd_lpm.h +++ b/examples/l3fwd/l3fwd_lpm.h @@ -44,7 +44,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(qconf, m, dst_port); } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { @@ -66,7 +66,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(qconf, m, dst_port); } else { diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c index 7470aa539a..903bf8c8e8 100644 --- a/examples/link_status_interrupt/main.c +++ b/examples/link_status_interrupt/main.c @@ -182,11 +182,11 @@ lsi_simple_forward(struct rte_mbuf *m, unsigned portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], ð->src_addr); buffer = tx_buffer[dst_port]; sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 2f593abf26..b3024a40e6 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -1078,14 +1078,14 @@ simple_ipv4_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid) *(uint64_t *)ð_hdr[7]->d_addr = dest_eth_addr[dst_port[7]]; /* src addr */ - rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], ð_hdr[0]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], ð_hdr[1]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], ð_hdr[2]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], ð_hdr[3]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], ð_hdr[4]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], ð_hdr[5]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], ð_hdr[6]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], ð_hdr[7]->s_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], ð_hdr[0]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], ð_hdr[1]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], ð_hdr[2]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], ð_hdr[3]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], ð_hdr[4]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], ð_hdr[5]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], ð_hdr[6]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], ð_hdr[7]->src_addr); send_single_packet(m[0], (uint8_t)dst_port[0]); send_single_packet(m[1], (uint8_t)dst_port[1]); @@ -1213,14 +1213,14 @@ simple_ipv6_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid) *(uint64_t *)ð_hdr[7]->d_addr = dest_eth_addr[dst_port[7]]; /* src addr */ - rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], ð_hdr[0]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], ð_hdr[1]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], ð_hdr[2]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], ð_hdr[3]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], ð_hdr[4]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], ð_hdr[5]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], ð_hdr[6]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], ð_hdr[7]->s_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], ð_hdr[0]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], ð_hdr[1]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], ð_hdr[2]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], ð_hdr[3]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], ð_hdr[4]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], ð_hdr[5]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], ð_hdr[6]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], ð_hdr[7]->src_addr); send_single_packet(m[0], dst_port[0]); send_single_packet(m[1], dst_port[1]); @@ -1268,11 +1268,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid) ++(ipv4_hdr->hdr_checksum); #endif /* dst addr */ - *(uint64_t *)ð_hdr->d_addr = dest_eth_addr[dst_port]; + *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[dst_port]; /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(m, dst_port); } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { @@ -1290,11 +1290,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid) dst_port = portid; /* dst addr */ - *(uint64_t *)ð_hdr->d_addr = dest_eth_addr[dst_port]; + *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[dst_port]; /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(m, dst_port); } else diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index 4f32ade7fb..61e4ee0ea1 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -426,10 +426,10 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) created_pkt->data_len = pkt_size; created_pkt->pkt_len = pkt_size; eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(ð_addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_addr, ð_hdr->src_addr); /* Set multicast address 01-1B-19-00-00-00. */ - rte_ether_addr_copy(ð_multicast, ð_hdr->d_addr); + rte_ether_addr_copy(ð_multicast, ð_hdr->dst_addr); eth_hdr->ether_type = htons(PTP_PROTOCOL); ptp_msg = (struct ptp_message *) @@ -449,14 +449,14 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) client_clkid = &ptp_msg->delay_req.hdr.source_port_id.clock_id; - client_clkid->id[0] = eth_hdr->s_addr.addr_bytes[0]; - client_clkid->id[1] = eth_hdr->s_addr.addr_bytes[1]; - client_clkid->id[2] = eth_hdr->s_addr.addr_bytes[2]; + client_clkid->id[0] = eth_hdr->src_addr.addr_bytes[0]; + client_clkid->id[1] = eth_hdr->src_addr.addr_bytes[1]; + client_clkid->id[2] = eth_hdr->src_addr.addr_bytes[2]; client_clkid->id[3] = 0xFF; client_clkid->id[4] = 0xFE; - client_clkid->id[5] = eth_hdr->s_addr.addr_bytes[3]; - client_clkid->id[6] = eth_hdr->s_addr.addr_bytes[4]; - client_clkid->id[7] = eth_hdr->s_addr.addr_bytes[5]; + client_clkid->id[5] = eth_hdr->src_addr.addr_bytes[3]; + client_clkid->id[6] = eth_hdr->src_addr.addr_bytes[4]; + client_clkid->id[7] = eth_hdr->src_addr.addr_bytes[5]; rte_memcpy(&ptp_data->client_clock_id, client_clkid, diff --git a/examples/vhost/main.c b/examples/vhost/main.c index bc3d71c898..ba339076a5 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -763,7 +763,7 @@ link_vmdq(struct vhost_dev *vdev, struct rte_mbuf *m) /* Learn MAC address of guest device from packet */ pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - if (find_vhost_dev(&pkt_hdr->s_addr)) { + if (find_vhost_dev(&pkt_hdr->src_addr)) { RTE_LOG(ERR, VHOST_DATA, "(%d) device is using a registered MAC!\n", vdev->vid); @@ -771,7 +771,7 @@ link_vmdq(struct vhost_dev *vdev, struct rte_mbuf *m) } for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) - vdev->mac_address.addr_bytes[i] = pkt_hdr->s_addr.addr_bytes[i]; + vdev->mac_address.addr_bytes[i] = pkt_hdr->src_addr.addr_bytes[i]; /* vlan_tag currently uses the device_id. */ vdev->vlan_tag = vlan_tags[vdev->vid]; @@ -960,7 +960,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m) uint16_t lcore_id = rte_lcore_id(); pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - dst_vdev = find_vhost_dev(&pkt_hdr->d_addr); + dst_vdev = find_vhost_dev(&pkt_hdr->dst_addr); if (!dst_vdev) return -1; @@ -1008,7 +1008,7 @@ find_local_dest(struct vhost_dev *vdev, struct rte_mbuf *m, struct rte_ether_hdr *pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - dst_vdev = find_vhost_dev(&pkt_hdr->d_addr); + dst_vdev = find_vhost_dev(&pkt_hdr->dst_addr); if (!dst_vdev) return 0; @@ -1091,7 +1091,7 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag) nh = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - if (unlikely(rte_is_broadcast_ether_addr(&nh->d_addr))) { + if (unlikely(rte_is_broadcast_ether_addr(&nh->dst_addr))) { struct vhost_dev *vdev2; TAILQ_FOREACH(vdev2, &vhost_dev_list, global_vdev_entry) { diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c index d3bc19f78e..cbf6883a01 100644 --- a/examples/vmdq/main.c +++ b/examples/vmdq/main.c @@ -469,11 +469,11 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->src_addr); } /* When we receive a HUP signal, print out our stats */ diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c index 685a03bdd1..6a444508df 100644 --- a/examples/vmdq_dcb/main.c +++ b/examples/vmdq_dcb/main.c @@ -520,11 +520,11 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->src_addr); } /* When we receive a HUP signal, print out our stats */ diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 70f455d47d..3ce72ff198 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -784,8 +784,8 @@ struct rte_flow_item_eth { /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */ #ifndef __cplusplus static const struct rte_flow_item_eth rte_flow_item_eth_mask = { - .hdr.d_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.s_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", .hdr.ether_type = RTE_BE16(0x0000), }; #endif diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index feb5855144..aff22178e3 100644 --- a/lib/gro/gro_tcp4.c +++ b/lib/gro/gro_tcp4.c @@ -243,8 +243,8 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt, ip_id = is_atomic ? 0 : rte_be_to_cpu_16(ipv4_hdr->packet_id); sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq); - rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.eth_saddr)); - rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.eth_daddr)); + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.eth_daddr)); key.ip_src_addr = ipv4_hdr->src_addr; key.ip_dst_addr = ipv4_hdr->dst_addr; key.src_port = tcp_hdr->src_port; diff --git a/lib/gro/gro_udp4.c b/lib/gro/gro_udp4.c index b8301296df..e78dda7874 100644 --- a/lib/gro/gro_udp4.c +++ b/lib/gro/gro_udp4.c @@ -238,8 +238,8 @@ gro_udp4_reassemble(struct rte_mbuf *pkt, is_last_frag = ((frag_offset & RTE_IPV4_HDR_MF_FLAG) == 0) ? 1 : 0; frag_offset = (uint16_t)(frag_offset & RTE_IPV4_HDR_OFFSET_MASK) << 3; - rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.eth_saddr)); - rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.eth_daddr)); + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.eth_daddr)); key.ip_src_addr = ipv4_hdr->src_addr; key.ip_dst_addr = ipv4_hdr->dst_addr; key.ip_id = ip_id; diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c index f3b6e603b9..2005899afe 100644 --- a/lib/gro/gro_vxlan_tcp4.c +++ b/lib/gro/gro_vxlan_tcp4.c @@ -358,8 +358,8 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt, sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq); - rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.inner_key.eth_saddr)); - rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.inner_key.eth_daddr)); + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.inner_key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.inner_key.eth_daddr)); key.inner_key.ip_src_addr = ipv4_hdr->src_addr; key.inner_key.ip_dst_addr = ipv4_hdr->dst_addr; key.inner_key.recv_ack = tcp_hdr->recv_ack; @@ -368,8 +368,8 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt, key.vxlan_hdr.vx_flags = vxlan_hdr->vx_flags; key.vxlan_hdr.vx_vni = vxlan_hdr->vx_vni; - rte_ether_addr_copy(&(outer_eth_hdr->s_addr), &(key.outer_eth_saddr)); - rte_ether_addr_copy(&(outer_eth_hdr->d_addr), &(key.outer_eth_daddr)); + rte_ether_addr_copy(&(outer_eth_hdr->src_addr), &(key.outer_eth_saddr)); + rte_ether_addr_copy(&(outer_eth_hdr->dst_addr), &(key.outer_eth_daddr)); key.outer_ip_src_addr = outer_ipv4_hdr->src_addr; key.outer_ip_dst_addr = outer_ipv4_hdr->dst_addr; key.outer_src_port = udp_hdr->src_port; diff --git a/lib/gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c index 37476361d5..4767c910bb 100644 --- a/lib/gro/gro_vxlan_udp4.c +++ b/lib/gro/gro_vxlan_udp4.c @@ -338,16 +338,16 @@ gro_vxlan_udp4_reassemble(struct rte_mbuf *pkt, is_last_frag = ((frag_offset & RTE_IPV4_HDR_MF_FLAG) == 0) ? 1 : 0; frag_offset = (uint16_t)(frag_offset & RTE_IPV4_HDR_OFFSET_MASK) << 3; - rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.inner_key.eth_saddr)); - rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.inner_key.eth_daddr)); + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.inner_key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.inner_key.eth_daddr)); key.inner_key.ip_src_addr = ipv4_hdr->src_addr; key.inner_key.ip_dst_addr = ipv4_hdr->dst_addr; key.inner_key.ip_id = ip_id; key.vxlan_hdr.vx_flags = vxlan_hdr->vx_flags; key.vxlan_hdr.vx_vni = vxlan_hdr->vx_vni; - rte_ether_addr_copy(&(outer_eth_hdr->s_addr), &(key.outer_eth_saddr)); - rte_ether_addr_copy(&(outer_eth_hdr->d_addr), &(key.outer_eth_daddr)); + rte_ether_addr_copy(&(outer_eth_hdr->src_addr), &(key.outer_eth_saddr)); + rte_ether_addr_copy(&(outer_eth_hdr->dst_addr), &(key.outer_eth_daddr)); key.outer_ip_src_addr = outer_ipv4_hdr->src_addr; key.outer_ip_dst_addr = outer_ipv4_hdr->dst_addr; /* Note: It is unnecessary to save outer_src_port here because it can diff --git a/lib/net/rte_arp.c b/lib/net/rte_arp.c index 5c1e27b8c0..9f7eb6b375 100644 --- a/lib/net/rte_arp.c +++ b/lib/net/rte_arp.c @@ -29,8 +29,8 @@ 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, ð_hdr->s_addr); + memset(eth_hdr->dst_addr.addr_bytes, 0xff, RTE_ETHER_ADDR_LEN); + rte_ether_addr_copy(mac, ð_hdr->src_addr); eth_hdr->ether_type = RTE_BE16(RTE_ETHER_TYPE_RARP); /* RARP header. */ diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h index 7ee5e9a292..ff9829a3a3 100644 --- a/lib/net/rte_ether.h +++ b/lib/net/rte_ether.h @@ -253,34 +253,16 @@ __rte_experimental 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 diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c index 98f3438774..8c010763c7 100644 --- a/lib/pipeline/rte_table_action.c +++ b/lib/pipeline/rte_table_action.c @@ -615,8 +615,8 @@ encap_ether_apply(void *data, RTE_ETHER_TYPE_IPV6; /* Ethernet */ - rte_ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->ether.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->ether.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->ether.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(ethertype); return 0; @@ -633,8 +633,8 @@ encap_vlan_apply(void *data, RTE_ETHER_TYPE_IPV6; /* Ethernet */ - rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->vlan.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->vlan.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN); /* VLAN */ @@ -657,8 +657,8 @@ encap_qinq_apply(void *data, RTE_ETHER_TYPE_IPV6; /* Ethernet */ - rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_QINQ); /* SVLAN */ @@ -683,8 +683,8 @@ encap_qinq_pppoe_apply(void *data, struct encap_qinq_pppoe_data *d = data; /* Ethernet */ - rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN); /* SVLAN */ @@ -719,8 +719,8 @@ encap_mpls_apply(void *data, uint32_t i; /* Ethernet */ - rte_ether_addr_copy(&p->mpls.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->mpls.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->mpls.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->mpls.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(ethertype); /* MPLS */ @@ -746,8 +746,8 @@ encap_pppoe_apply(void *data, struct encap_pppoe_data *d = data; /* Ethernet */ - rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION); /* PPPoE and PPP*/ @@ -777,9 +777,9 @@ encap_vxlan_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->vxlan.ether.da, - &d->ether.d_addr); + &d->ether.dst_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, - &d->ether.s_addr); + &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN); /* VLAN */ @@ -818,9 +818,9 @@ encap_vxlan_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->vxlan.ether.da, - &d->ether.d_addr); + &d->ether.dst_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, - &d->ether.s_addr); + &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPV4); /* IPv4*/ @@ -855,9 +855,9 @@ encap_vxlan_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->vxlan.ether.da, - &d->ether.d_addr); + &d->ether.dst_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, - &d->ether.s_addr); + &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN); /* VLAN */ @@ -896,9 +896,9 @@ encap_vxlan_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->vxlan.ether.da, - &d->ether.d_addr); + &d->ether.dst_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, - &d->ether.s_addr); + &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPV6); /* IPv6*/