net: add rte prefix to ether functions
authorOlivier Matz <olivier.matz@6wind.com>
Fri, 26 Oct 2018 07:03:54 +0000 (09:03 +0200)
committerOlivier Matz <olivier.matz@6wind.com>
Fri, 26 Oct 2018 07:03:54 +0000 (09:03 +0200)
Add 'rte_' prefix to functions:
- rename is_same_ether_addr() as rte_is_same_ether_addr().
- rename is_zero_ether_addr() as rte_is_zero_ether_addr().
- rename is_unicast_ether_addr() as rte_is_unicast_ether_addr().
- rename is_multicast_ether_addr() as rte_is_multicast_ether_addr().
- rename is_broadcast_ether_addr() as rte_is_broadcast_ether_addr().
- rename is_universal_ether_addr() as rte_is_universal_ether_addr().
- rename is_local_admin_ether_addr() as rte_is_local_admin_ether_addr().
- rename is_valid_assigned_ether_addr() as rte_is_valid_assigned_ether_addr().
- rename eth_random_addr() as rte_eth_random_addr().
- rename ether_addr_copy() as rte_ether_addr_copy().
- rename ether_format_addr() as rte_ether_format_addr().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
116 files changed:
app/test-pmd/cmdline.c
app/test-pmd/config.c
app/test-pmd/csumonly.c
app/test-pmd/flowgen.c
app/test-pmd/icmpecho.c
app/test-pmd/ieee1588fwd.c
app/test-pmd/macfwd.c
app/test-pmd/macswap.c
app/test-pmd/txonly.c
app/test-pmd/util.c
doc/guides/sample_app_ug/ipv4_multicast.rst
doc/guides/sample_app_ug/l2_forward_job_stats.rst
doc/guides/sample_app_ug/l2_forward_real_virtual.rst
doc/guides/sample_app_ug/link_status_intr.rst
drivers/net/atlantic/atl_ethdev.c
drivers/net/atlantic/hw_atl/hw_atl_utils.c
drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c
drivers/net/avf/avf_ethdev.c
drivers/net/avf/avf_vchnl.c
drivers/net/avp/avp_ethdev.c
drivers/net/axgbe/axgbe_ethdev.c
drivers/net/bnx2x/bnx2x.c
drivers/net/bnx2x/bnx2x_vfpf.c
drivers/net/bnxt/bnxt_flow.c
drivers/net/bnxt/bnxt_hwrm.c
drivers/net/bonding/rte_eth_bond_8023ad.c
drivers/net/bonding/rte_eth_bond_alb.c
drivers/net/bonding/rte_eth_bond_pmd.c
drivers/net/cxgbe/base/adapter.h
drivers/net/cxgbe/cxgbe_flow.c
drivers/net/dpaa/dpaa_ethdev.c
drivers/net/dpaa2/dpaa2_ethdev.c
drivers/net/e1000/em_ethdev.c
drivers/net/e1000/igb_ethdev.c
drivers/net/e1000/igb_flow.c
drivers/net/e1000/igb_pf.c
drivers/net/ena/ena_ethdev.c
drivers/net/enetc/enetc_ethdev.c
drivers/net/enic/enic_main.c
drivers/net/failsafe/failsafe.c
drivers/net/failsafe/failsafe_ether.c
drivers/net/fm10k/fm10k_ethdev.c
drivers/net/i40e/i40e_ethdev.c
drivers/net/i40e/i40e_ethdev_vf.c
drivers/net/i40e/i40e_flow.c
drivers/net/i40e/i40e_pf.c
drivers/net/i40e/rte_pmd_i40e.c
drivers/net/ixgbe/ixgbe_ethdev.c
drivers/net/ixgbe/ixgbe_flow.c
drivers/net/ixgbe/ixgbe_pf.c
drivers/net/ixgbe/rte_pmd_ixgbe.c
drivers/net/kni/rte_eth_kni.c
drivers/net/liquidio/lio_ethdev.c
drivers/net/mlx4/mlx4_flow.c
drivers/net/mlx5/mlx5_flow_tcf.c
drivers/net/mlx5/mlx5_mac.c
drivers/net/mlx5/mlx5_nl.c
drivers/net/mvneta/mvneta_ethdev.c
drivers/net/mvpp2/mrvl_ethdev.c
drivers/net/netvsc/hn_rxtx.c
drivers/net/netvsc/hn_vf.c
drivers/net/nfp/nfp_net.c
drivers/net/null/rte_eth_null.c
drivers/net/qede/qede_ethdev.c
drivers/net/sfc/sfc_ethdev.c
drivers/net/sfc/sfc_flow.c
drivers/net/sfc/sfc_port.c
drivers/net/szedata2/rte_eth_szedata2.c
drivers/net/tap/rte_eth_tap.c
drivers/net/tap/tap_flow.c
drivers/net/thunderx/base/nicvf_mbox.c
drivers/net/thunderx/nicvf_ethdev.c
drivers/net/vdev_netvsc/vdev_netvsc.c
drivers/net/vhost/rte_eth_vhost.c
drivers/net/virtio/virtio_ethdev.c
drivers/net/virtio/virtio_rxtx.c
drivers/net/vmxnet3/vmxnet3_ethdev.c
examples/bond/main.c
examples/ethtool/ethtool-app/main.c
examples/ethtool/lib/rte_ethtool.c
examples/eventdev_pipeline/pipeline_common.h
examples/flow_filtering/main.c
examples/ip_fragmentation/main.c
examples/ip_reassembly/main.c
examples/ipsec-secgw/ipsec-secgw.c
examples/ipv4_multicast/main.c
examples/kni/main.c
examples/l2fwd-crypto/main.c
examples/l2fwd-jobstats/main.c
examples/l2fwd-keepalive/main.c
examples/l2fwd/main.c
examples/l3fwd-acl/main.c
examples/l3fwd-power/main.c
examples/l3fwd-vf/main.c
examples/l3fwd/l3fwd_em.h
examples/l3fwd/l3fwd_lpm.h
examples/l3fwd/main.c
examples/link_status_interrupt/main.c
examples/performance-thread/l3fwd-thread/main.c
examples/ptpclient/ptpclient.c
examples/quota_watermark/qw/main.c
examples/tep_termination/vxlan_setup.c
examples/vhost/main.c
examples/vmdq/main.c
examples/vmdq_dcb/main.c
lib/librte_ethdev/rte_ethdev.c
lib/librte_gro/gro_tcp4.c
lib/librte_gro/gro_tcp4.h
lib/librte_gro/gro_vxlan_tcp4.c
lib/librte_net/rte_arp.c
lib/librte_net/rte_ether.h
lib/librte_pipeline/rte_table_action.c
test/test/packet_burst_generator.c
test/test/test_link_bonding.c
test/test/test_link_bonding_mode4.c
test/test/test_pmd_perf.c

index c866ffe..d21d984 100644 (file)
@@ -8607,8 +8607,8 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 
        memset(&tunnel_filter_conf, 0, sizeof(tunnel_filter_conf));
 
-       ether_addr_copy(&res->outer_mac, &tunnel_filter_conf.outer_mac);
-       ether_addr_copy(&res->inner_mac, &tunnel_filter_conf.inner_mac);
+       rte_ether_addr_copy(&res->outer_mac, &tunnel_filter_conf.outer_mac);
+       rte_ether_addr_copy(&res->inner_mac, &tunnel_filter_conf.inner_mac);
        tunnel_filter_conf.inner_vlan = res->inner_vlan;
 
        if (res->ip_value.family == AF_INET) {
@@ -12261,7 +12261,7 @@ static void cmd_mcast_addr_parsed(void *parsed_result,
 {
        struct cmd_mcast_addr_result *res = parsed_result;
 
-       if (!is_multicast_ether_addr(&res->mc_addr)) {
+       if (!rte_is_multicast_ether_addr(&res->mc_addr)) {
                printf("Invalid multicast addr %02X:%02X:%02X:%02X:%02X:%02X\n",
                       res->mc_addr.addr_bytes[0], res->mc_addr.addr_bytes[1],
                       res->mc_addr.addr_bytes[2], res->mc_addr.addr_bytes[3],
index 614719e..9db38e3 100644 (file)
@@ -107,7 +107,7 @@ static void
 print_ethaddr(const char *name, struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
@@ -3530,7 +3530,7 @@ mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr)
         * in the pool of multicast addresses.
         */
        for (i = 0; i < port->mc_addr_nb; i++) {
-               if (is_same_ether_addr(mc_addr, &port->mc_addr_pool[i])) {
+               if (rte_is_same_ether_addr(mc_addr, &port->mc_addr_pool[i])) {
                        printf("multicast address already filtered by port\n");
                        return;
                }
@@ -3538,7 +3538,7 @@ mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr)
 
        if (mcast_addr_pool_extend(port) != 0)
                return;
-       ether_addr_copy(mc_addr, &port->mc_addr_pool[i]);
+       rte_ether_addr_copy(mc_addr, &port->mc_addr_pool[i]);
        eth_port_multicast_addr_list_set(port_id);
 }
 
@@ -3557,7 +3557,7 @@ mcast_addr_remove(portid_t port_id, struct rte_ether_addr *mc_addr)
         * Search the pool of multicast MAC addresses for the removed address.
         */
        for (i = 0; i < port->mc_addr_nb; i++) {
-               if (is_same_ether_addr(mc_addr, &port->mc_addr_pool[i]))
+               if (rte_is_same_ether_addr(mc_addr, &port->mc_addr_pool[i]))
                        break;
        }
        if (i == port->mc_addr_nb) {
index 2c45869..f3fb78a 100644 (file)
@@ -762,9 +762,9 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                 * and inner headers */
 
                eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
-               ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
+               rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
                                &eth_hdr->d_addr);
-               ether_addr_copy(&ports[fs->tx_port].eth_addr,
+               rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
                                &eth_hdr->s_addr);
                parse_ethernet(eth_hdr, &info);
                l3_hdr = (char *)eth_hdr + info.l2_len;
index 574162c..cbba521 100644 (file)
@@ -171,8 +171,8 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
 
                /* Initialize Ethernet header. */
                eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
-               ether_addr_copy(&cfg_ether_dst, &eth_hdr->d_addr);
-               ether_addr_copy(&cfg_ether_src, &eth_hdr->s_addr);
+               rte_ether_addr_copy(&cfg_ether_dst, &eth_hdr->d_addr);
+               rte_ether_addr_copy(&cfg_ether_src, &eth_hdr->s_addr);
                eth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
 
                /* Initialize IP header. */
index 49720ad..879f628 100644 (file)
@@ -225,7 +225,7 @@ ether_addr_dump(const char *what, const struct rte_ether_addr *ea)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
 
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, ea);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, ea);
        if (what)
                printf("%s", what);
        printf("%s", buf);
@@ -370,12 +370,12 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                                continue;
                        }
                        if (verbose_level > 0) {
-                               ether_addr_copy(&arp_h->arp_data.arp_sha, &eth_addr);
+                               rte_ether_addr_copy(&arp_h->arp_data.arp_sha, &eth_addr);
                                ether_addr_dump("        sha=", &eth_addr);
                                ip_addr = arp_h->arp_data.arp_sip;
                                ipv4_addr_dump(" sip=", ip_addr);
                                printf("\n");
-                               ether_addr_copy(&arp_h->arp_data.arp_tha, &eth_addr);
+                               rte_ether_addr_copy(&arp_h->arp_data.arp_tha, &eth_addr);
                                ether_addr_dump("        tha=", &eth_addr);
                                ip_addr = arp_h->arp_data.arp_tip;
                                ipv4_addr_dump(" tip=", ip_addr);
@@ -391,15 +391,15 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
                         */
 
                        /* Use source MAC address as destination MAC address. */
-                       ether_addr_copy(&eth_h->s_addr, &eth_h->d_addr);
+                       rte_ether_addr_copy(&eth_h->s_addr, &eth_h->d_addr);
                        /* Set source MAC address with MAC address of TX port */
-                       ether_addr_copy(&ports[fs->tx_port].eth_addr,
+                       rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
                                        &eth_h->s_addr);
 
                        arp_h->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY);
-                       ether_addr_copy(&arp_h->arp_data.arp_tha, &eth_addr);
-                       ether_addr_copy(&arp_h->arp_data.arp_sha, &arp_h->arp_data.arp_tha);
-                       ether_addr_copy(&eth_h->s_addr, &arp_h->arp_data.arp_sha);
+                       rte_ether_addr_copy(&arp_h->arp_data.arp_tha, &eth_addr);
+                       rte_ether_addr_copy(&arp_h->arp_data.arp_sha, &arp_h->arp_data.arp_tha);
+                       rte_ether_addr_copy(&eth_h->s_addr, &arp_h->arp_data.arp_sha);
 
                        /* Swap IP addresses in ARP payload */
                        ip_addr = arp_h->arp_data.arp_sip;
@@ -456,9 +456,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.
                 */
-               ether_addr_copy(&eth_h->s_addr, &eth_addr);
-               ether_addr_copy(&eth_h->d_addr, &eth_h->s_addr);
-               ether_addr_copy(&eth_addr, &eth_h->d_addr);
+               rte_ether_addr_copy(&eth_h->s_addr, &eth_addr);
+               rte_ether_addr_copy(&eth_h->d_addr, &eth_h->s_addr);
+               rte_ether_addr_copy(&eth_addr, &eth_h->d_addr);
                ip_addr = ip_h->src_addr;
                if (is_multicast_ipv4_addr(ip_h->dst_addr)) {
                        uint32_t ip_src;
index c6aa3c6..2b7003b 100644 (file)
@@ -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. */
-       ether_addr_copy(&eth_hdr->d_addr, &addr);
-       ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-       ether_addr_copy(&addr, &eth_hdr->s_addr);
+       rte_ether_addr_copy(&eth_hdr->d_addr, &addr);
+       rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
+       rte_ether_addr_copy(&addr, &eth_hdr->s_addr);
 
        /* Forward PTP packet with hardware TX timestamp */
        mb->ol_flags |= PKT_TX_IEEE1588_TMST;
index 631f86f..f151492 100644 (file)
@@ -92,9 +92,9 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
                                                       void *));
                mb = pkts_burst[i];
                eth_hdr = rte_pktmbuf_mtod(mb, struct rte_ether_hdr *);
-               ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
+               rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
                                &eth_hdr->d_addr);
-               ether_addr_copy(&ports[fs->tx_port].eth_addr,
+               rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
                                &eth_hdr->s_addr);
                mb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF;
                mb->ol_flags |= ol_flags;
index 36d3857..4c57a2a 100644 (file)
@@ -123,9 +123,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
                eth_hdr = rte_pktmbuf_mtod(mb, struct rte_ether_hdr *);
 
                /* Swap dest and src mac addresses. */
-               ether_addr_copy(&eth_hdr->d_addr, &addr);
-               ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-               ether_addr_copy(&addr, &eth_hdr->s_addr);
+               rte_ether_addr_copy(&eth_hdr->d_addr, &addr);
+               rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
+               rte_ether_addr_copy(&addr, &eth_hdr->s_addr);
 
                mb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF;
                mb->ol_flags |= ol_flags;
index 3aa5e25..eb73194 100644 (file)
@@ -227,8 +227,8 @@ pkt_burst_transmit(struct fwd_stream *fs)
                /*
                 * Initialize Ethernet header.
                 */
-               ether_addr_copy(&peer_eth_addrs[fs->peer_addr],&eth_hdr.d_addr);
-               ether_addr_copy(&ports[fs->tx_port].eth_addr, &eth_hdr.s_addr);
+               rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr],&eth_hdr.d_addr);
+               rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, &eth_hdr.s_addr);
                eth_hdr.ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
 
                /*
index 3181529..c7c4973 100644 (file)
@@ -17,7 +17,7 @@ static inline void
 print_ether_addr(const char *what, struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", what, buf);
 }
 
index 8f2fb39..68ae685 100644 (file)
@@ -227,8 +227,8 @@ The actual packet transmission is done in the mcast_send_pkt() function:
 
         RTE_ASSERT(ethdr != NULL);
 
-        ether_addr_copy(dest_addr, &ethdr->d_addr);
-        ether_addr_copy(&ports_eth_addr[port], &ethdr->s_addr);
+        rte_ether_addr_copy(dest_addr, &ethdr->d_addr);
+        rte_ether_addr_copy(&ports_eth_addr[port], &ethdr->s_addr);
         ethdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
 
         /* Put new packet into the output queue */
index 15ca6db..d3cdc62 100644 (file)
@@ -467,7 +467,7 @@ Naturally, the number of ports in the portmask must be even, otherwise, the appl
 
         /* src addr */
 
-        ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
+        rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
 
         l2fwd_send_packet(m, (uint8_t) dst_port);
     }
index 33f7ee7..59f5c8b 100644 (file)
@@ -383,7 +383,7 @@ Naturally, the number of ports in the portmask must be even, otherwise, the appl
 
         /* src addr */
 
-        ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
+        rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
 
         l2fwd_send_packet(m, (uint8_t) dst_port);
     }
index 50baf34..a3ba229 100644 (file)
@@ -324,7 +324,7 @@ The processing is very simple: processes the TX port from the RX port and then r
         *((uint64_t *)tmp) = 0x000000000002 + (dst_port << 40);
 
         /* src addr */
-        ether_addr_copy(&lsi_ports_eth_addr[dst_port], &eth->s_addr);
+        rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], &eth->s_addr);
 
         lsi_send_packet(m, dst_port);
     }
index 5be9e52..585d244 100644 (file)
@@ -1229,7 +1229,7 @@ static int
 atl_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
                        uint32_t index __rte_unused, uint32_t pool __rte_unused)
 {
-       if (is_zero_ether_addr(mac_addr)) {
+       if (rte_is_zero_ether_addr(mac_addr)) {
                PMD_DRV_LOG(ERR, "Invalid Ethernet Address");
                return -EINVAL;
        }
index 401bd11..4075f28 100644 (file)
@@ -654,7 +654,7 @@ static int hw_atl_utils_get_mac_permanent(struct aq_hw_s *self,
                mac_addr[1] = rte_constant_bswap32(mac_addr[1]);
        }
 
-       ether_addr_copy((struct rte_ether_addr *)mac_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)mac_addr,
                        (struct rte_ether_addr *)mac);
 
        if ((mac[0] & 0x01U) || ((mac[0] | mac[1] | mac[2]) == 0x00U)) {
@@ -865,7 +865,7 @@ static int aq_fw1x_set_wol(struct aq_hw_s *self, bool wol_enabled, u8 *mac)
                prpc->msg_wol.pattern_id = 1U;
                prpc->msg_wol.wol_packet_type = 2U; /* Magic Packet */
 
-               ether_addr_copy((struct rte_ether_addr *)mac,
+               rte_ether_addr_copy((struct rte_ether_addr *)mac,
                        (struct rte_ether_addr *)&prpc->msg_wol.wol_pattern);
        } else {
                rpc_size = sizeof(prpc->msg_id) + sizeof(prpc->msg_del_id);
index 1fc18bb..c336b85 100644 (file)
@@ -218,7 +218,7 @@ int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac)
                mac_addr[1] = rte_constant_bswap32(mac_addr[1]);
        }
 
-       ether_addr_copy((struct rte_ether_addr *)mac_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)mac_addr,
                        (struct rte_ether_addr *)mac);
 
        if ((mac[0] & 0x01U) || ((mac[0] | mac[1] | mac[2]) == 0x00U)) {
index 523911e..af39444 100644 (file)
@@ -696,7 +696,7 @@ avf_dev_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *addr,
        struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(adapter);
        int err;
 
-       if (is_zero_ether_addr(addr)) {
+       if (rte_is_zero_ether_addr(addr)) {
                PMD_DRV_LOG(ERR, "Invalid Ethernet Address");
                return -EINVAL;
        }
@@ -941,11 +941,11 @@ avf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
        old_addr = (struct rte_ether_addr *)hw->mac.addr;
        perm_addr = (struct rte_ether_addr *)hw->mac.perm_addr;
 
-       if (is_same_ether_addr(mac_addr, old_addr))
+       if (rte_is_same_ether_addr(mac_addr, old_addr))
                return 0;
 
        /* If the MAC address is configured by host, skip the setting */
-       if (is_valid_assigned_ether_addr(perm_addr))
+       if (rte_is_valid_assigned_ether_addr(perm_addr))
                return -EPERM;
 
        ret = avf_add_del_eth_addr(adapter, old_addr, FALSE);
@@ -973,7 +973,7 @@ avf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
        if (ret)
                return -EIO;
 
-       ether_addr_copy(mac_addr, (struct rte_ether_addr *)hw->mac.addr);
+       rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)hw->mac.addr);
        return 0;
 }
 
@@ -1244,9 +1244,9 @@ avf_dev_init(struct rte_eth_dev *eth_dev)
        /* If the MAC address is not configured by host,
         * generate a random one.
         */
-       if (!is_valid_assigned_ether_addr((struct rte_ether_addr *)hw->mac.addr))
-               eth_random_addr(hw->mac.addr);
-       ether_addr_copy((struct rte_ether_addr *)hw->mac.addr,
+       if (!rte_is_valid_assigned_ether_addr((struct rte_ether_addr *)hw->mac.addr))
+               rte_eth_random_addr(hw->mac.addr);
+       rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.addr,
                        &eth_dev->data->mac_addrs[0]);
 
        /* register callback func to eal lib */
index 6ccd7a1..32aa62e 100644 (file)
@@ -647,7 +647,7 @@ avf_add_del_all_mac_addr(struct avf_adapter *adapter, bool add)
                len = sizeof(struct virtchnl_ether_addr_list);
                for (i = begin; i < AVF_NUM_MACADDR_MAX; i++, next_begin++) {
                        addr = &adapter->eth_dev->data->mac_addrs[i];
-                       if (is_zero_ether_addr(addr))
+                       if (rte_is_zero_ether_addr(addr))
                                continue;
                        len += sizeof(struct virtchnl_ether_addr);
                        if (len >= AVF_AQ_BUF_SZ) {
@@ -664,7 +664,7 @@ avf_add_del_all_mac_addr(struct avf_adapter *adapter, bool add)
 
                for (i = begin; i < next_begin; i++) {
                        addr = &adapter->eth_dev->data->mac_addrs[i];
-                       if (is_zero_ether_addr(addr))
+                       if (rte_is_zero_ether_addr(addr))
                                continue;
                        rte_memcpy(list->list[j].addr, addr->addr_bytes,
                                   sizeof(addr->addr_bytes));
index 834b1f3..4f563d1 100644 (file)
@@ -1014,7 +1014,7 @@ eth_avp_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* Get a mac from device config */
-       ether_addr_copy(&avp->ethaddr, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(&avp->ethaddr, &eth_dev->data->mac_addrs[0]);
 
        return 0;
 }
@@ -1221,12 +1221,12 @@ _avp_mac_filter(struct avp_dev *avp, struct rte_mbuf *m)
                return 0;
        }
 
-       if (likely(is_broadcast_ether_addr(&eth->d_addr))) {
+       if (likely(rte_is_broadcast_ether_addr(&eth->d_addr))) {
                /* allow all broadcast packets */
                return 0;
        }
 
-       if (likely(is_multicast_ether_addr(&eth->d_addr))) {
+       if (likely(rte_is_multicast_ether_addr(&eth->d_addr))) {
                /* allow all multicast packets */
                return 0;
        }
index 4b84b50..c8ce677 100644 (file)
@@ -634,11 +634,11 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
                return -ENOMEM;
        }
 
-       if (!is_valid_assigned_ether_addr(&pdata->mac_addr))
-               eth_random_addr(pdata->mac_addr.addr_bytes);
+       if (!rte_is_valid_assigned_ether_addr(&pdata->mac_addr))
+               rte_eth_random_addr(pdata->mac_addr.addr_bytes);
 
        /* Copy the permanent MAC address */
-       ether_addr_copy(&pdata->mac_addr, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(&pdata->mac_addr, &eth_dev->data->mac_addrs[0]);
 
        /* Clock settings */
        pdata->sysclk_rate = AXGBE_V2_DMA_CLOCK_FREQ;
index f3e2355..3088e27 100644 (file)
@@ -2185,8 +2185,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 (is_multicast_ether_addr(&eh->d_addr)) {
-                       if (is_broadcast_ether_addr(&eh->d_addr))
+               if (rte_is_multicast_ether_addr(&eh->d_addr)) {
+                       if (rte_is_broadcast_ether_addr(&eh->d_addr))
                                mac_type = BROADCAST_ADDRESS;
                        else
                                mac_type = MULTICAST_ADDRESS;
index a044e6e..67e3b54 100644 (file)
@@ -300,11 +300,11 @@ int bnx2x_vf_get_resources(struct bnx2x_softc *sc, uint8_t tx_count, uint8_t rx_
                sc->igu_sb_cnt, sc->igu_base_sb);
        strncpy(sc->fw_ver, sc_resp.fw_ver, sizeof(sc->fw_ver));
 
-       if (is_valid_assigned_ether_addr(&sc_resp.resc.current_mac_addr))
-               ether_addr_copy(&sc_resp.resc.current_mac_addr,
+       if (rte_is_valid_assigned_ether_addr(&sc_resp.resc.current_mac_addr))
+               rte_ether_addr_copy(&sc_resp.resc.current_mac_addr,
                                (struct rte_ether_addr *)sc->link_params.mac_addr);
        else
-               eth_random_addr(sc->link_params.mac_addr);
+               rte_eth_random_addr(sc->link_params.mac_addr);
 
 out:
        bnx2x_vf_finalize(sc, &acq->first_tlv);
index 1afe674..a1f527d 100644 (file)
@@ -187,10 +187,10 @@ bnxt_validate_and_parse_flow_type(struct bnxt *bp,
                         * Destination MAC address mask must not be partially
                         * set. Should be all 1's or all 0's.
                         */
-                       if ((!is_zero_ether_addr(&eth_mask->src) &&
-                            !is_broadcast_ether_addr(&eth_mask->src)) ||
-                           (!is_zero_ether_addr(&eth_mask->dst) &&
-                            !is_broadcast_ether_addr(&eth_mask->dst))) {
+                       if ((!rte_is_zero_ether_addr(&eth_mask->src) &&
+                            !rte_is_broadcast_ether_addr(&eth_mask->src)) ||
+                           (!rte_is_zero_ether_addr(&eth_mask->dst) &&
+                            !rte_is_broadcast_ether_addr(&eth_mask->dst))) {
                                rte_flow_error_set(error,
                                                   EINVAL,
                                                   RTE_FLOW_ERROR_TYPE_ITEM,
@@ -209,7 +209,7 @@ bnxt_validate_and_parse_flow_type(struct bnxt *bp,
                                return -rte_errno;
                        }
 
-                       if (is_broadcast_ether_addr(&eth_mask->dst)) {
+                       if (rte_is_broadcast_ether_addr(&eth_mask->dst)) {
                                rte_memcpy(filter->dst_macaddr,
                                           &eth_spec->dst, 6);
                                en |= use_ntuple ?
@@ -217,7 +217,7 @@ bnxt_validate_and_parse_flow_type(struct bnxt *bp,
                                        EM_FLOW_ALLOC_INPUT_EN_DST_MACADDR;
                        }
 
-                       if (is_broadcast_ether_addr(&eth_mask->src)) {
+                       if (rte_is_broadcast_ether_addr(&eth_mask->src)) {
                                rte_memcpy(filter->src_macaddr,
                                           &eth_spec->src, 6);
                                en |= use_ntuple ?
index b6f7612..7903ac7 100644 (file)
@@ -2586,7 +2586,7 @@ static void add_random_mac_if_needed(struct bnxt *bp,
        if (memcmp(mac.addr_bytes, "\x00\x00\x00\x00\x00", 6) == 0) {
                cfg_req->enables |=
                rte_cpu_to_le_32(HWRM_FUNC_CFG_INPUT_ENABLES_DFLT_MAC_ADDR);
-               eth_random_addr(cfg_req->dflt_mac_addr);
+               rte_eth_random_addr(cfg_req->dflt_mac_addr);
                bp->pf.vf_info[vf].random_mac = true;
        } else {
                memcpy(cfg_req->dflt_mac_addr, mac.addr_bytes, ETHER_ADDR_LEN);
index 608d754..f9ab695 100644 (file)
@@ -322,7 +322,7 @@ rx_machine(struct bond_dev_private *internals, uint16_t slave_id,
                agg = &mode_8023ad_ports[port->aggregator_port_id];
                bool match = port->actor.system_priority ==
                        lacp->partner.port_params.system_priority &&
-                       is_same_ether_addr(&agg->actor.system,
+                       rte_is_same_ether_addr(&agg->actor.system,
                        &lacp->partner.port_params.system) &&
                        port->actor.port_priority ==
                        lacp->partner.port_params.port_priority &&
@@ -575,7 +575,7 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id)
        hdr = rte_pktmbuf_mtod(lacp_pkt, struct lacpdu_header *);
 
        /* Source and destination MAC */
-       ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.d_addr);
+       rte_ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.d_addr);
        rte_eth_macaddr_get(slave_id, &hdr->eth_hdr.s_addr);
        hdr->eth_hdr.ether_type = rte_cpu_to_be_16(ETHER_TYPE_SLOW);
 
@@ -592,7 +592,7 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id)
        memcpy(&hdr->lacpdu.actor.port_params, &port->actor,
                        sizeof(port->actor));
        agg = &mode_8023ad_ports[port->aggregator_port_id];
-       ether_addr_copy(&agg->actor.system, &hdr->lacpdu.actor.port_params.system);
+       rte_ether_addr_copy(&agg->actor.system, &hdr->lacpdu.actor.port_params.system);
        lacpdu->actor.state = port->actor_state;
 
        /* PARTNER */
@@ -694,9 +694,9 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id)
                 * ID (MAC address). */
                if ((agg->actor.key == port->actor.key &&
                        agg->partner.system_priority == port->partner.system_priority &&
-                       is_same_ether_addr(&agg->partner.system, &port->partner.system) == 1
+                       rte_is_same_ether_addr(&agg->partner.system, &port->partner.system) == 1
                        && (agg->partner.key == port->partner.key)) &&
-                       is_zero_ether_addr(&port->partner.system) != 1 &&
+                       rte_is_zero_ether_addr(&port->partner.system) != 1 &&
                        (agg->actor.key &
                                rte_cpu_to_be_16(BOND_LINK_FULL_DUPLEX_KEY)) != 0) {
 
@@ -835,8 +835,8 @@ bond_mode_8023ad_periodic_cb(void *arg)
                        SM_FLAG_SET(port, NTT);
                }
 
-               if (!is_same_ether_addr(&port->actor.system, &slave_addr)) {
-                       ether_addr_copy(&slave_addr, &port->actor.system);
+               if (!rte_is_same_ether_addr(&port->actor.system, &slave_addr)) {
+                       rte_ether_addr_copy(&slave_addr, &port->actor.system);
                        if (port->aggregator_port_id == slave_id)
                                SM_FLAG_SET(port, NTT);
                }
@@ -1048,10 +1048,10 @@ bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev)
                slave = &mode_8023ad_ports[slave_id];
                rte_eth_macaddr_get(slave_id, &slave_addr);
 
-               if (is_same_ether_addr(&slave_addr, &slave->actor.system))
+               if (rte_is_same_ether_addr(&slave_addr, &slave->actor.system))
                        continue;
 
-               ether_addr_copy(&slave_addr, &slave->actor.system);
+               rte_ether_addr_copy(&slave_addr, &slave->actor.system);
                /* Do nothing if this port is not an aggregator. In other case
                 * Set NTT flag on every port that use this aggregator. */
                if (slave->aggregator_port_id != slave_id)
index 24b2b50..446677f 100644 (file)
@@ -101,17 +101,17 @@ void bond_mode_alb_arp_recv(struct rte_ether_hdr *eth_h, uint16_t offset,
        if (client_info->in_use == 0 ||
                        client_info->app_ip != arp->arp_data.arp_tip ||
                        client_info->cli_ip != arp->arp_data.arp_sip ||
-                       !is_same_ether_addr(&client_info->cli_mac, &arp->arp_data.arp_sha) ||
+                       !rte_is_same_ether_addr(&client_info->cli_mac, &arp->arp_data.arp_sha) ||
                        client_info->vlan_count != offset / sizeof(struct rte_vlan_hdr) ||
                        memcmp(client_info->vlan, eth_h + 1, offset) != 0
        ) {
                client_info->in_use = 1;
                client_info->app_ip = arp->arp_data.arp_tip;
                client_info->cli_ip = arp->arp_data.arp_sip;
-               ether_addr_copy(&arp->arp_data.arp_sha, &client_info->cli_mac);
+               rte_ether_addr_copy(&arp->arp_data.arp_sha, &client_info->cli_mac);
                client_info->slave_idx = calculate_slave(internals);
                rte_eth_macaddr_get(client_info->slave_idx, &client_info->app_mac);
-               ether_addr_copy(&client_info->app_mac, &arp->arp_data.arp_tha);
+               rte_ether_addr_copy(&client_info->app_mac, &arp->arp_data.arp_tha);
                memcpy(client_info->vlan, eth_h + 1, offset);
                client_info->vlan_count = offset / sizeof(struct rte_vlan_hdr);
        }
@@ -139,7 +139,7 @@ bond_mode_alb_arp_xmit(struct rte_ether_hdr *eth_h, uint16_t offset,
         * current primary port.
         */
        rte_eth_macaddr_get(internals->port_id, &bonding_mac);
-       if (!is_same_ether_addr(&bonding_mac, &arp->arp_data.arp_sha)) {
+       if (!rte_is_same_ether_addr(&bonding_mac, &arp->arp_data.arp_sha)) {
                rte_eth_macaddr_get(internals->current_primary_port,
                                &arp->arp_data.arp_sha);
                return internals->current_primary_port;
@@ -155,13 +155,13 @@ bond_mode_alb_arp_xmit(struct rte_ether_hdr *eth_h, uint16_t offset,
                        if (client_info->app_ip == arp->arp_data.arp_sip &&
                                client_info->cli_ip == arp->arp_data.arp_tip) {
                                /* Entry is already assigned to this client */
-                               if (!is_broadcast_ether_addr(&arp->arp_data.arp_tha)) {
-                                       ether_addr_copy(&arp->arp_data.arp_tha,
+                               if (!rte_is_broadcast_ether_addr(&arp->arp_data.arp_tha)) {
+                                       rte_ether_addr_copy(&arp->arp_data.arp_tha,
                                                        &client_info->cli_mac);
                                }
                                rte_eth_macaddr_get(client_info->slave_idx,
                                                &client_info->app_mac);
-                               ether_addr_copy(&client_info->app_mac, &arp->arp_data.arp_sha);
+                               rte_ether_addr_copy(&client_info->app_mac, &arp->arp_data.arp_sha);
                                memcpy(client_info->vlan, eth_h + 1, offset);
                                client_info->vlan_count = offset / sizeof(struct rte_vlan_hdr);
                                rte_spinlock_unlock(&internals->mode6.lock);
@@ -173,11 +173,11 @@ bond_mode_alb_arp_xmit(struct rte_ether_hdr *eth_h, uint16_t offset,
                client_info->in_use = 1;
                client_info->ntt = 0;
                client_info->app_ip = arp->arp_data.arp_sip;
-               ether_addr_copy(&arp->arp_data.arp_tha, &client_info->cli_mac);
+               rte_ether_addr_copy(&arp->arp_data.arp_tha, &client_info->cli_mac);
                client_info->cli_ip = arp->arp_data.arp_tip;
                client_info->slave_idx = calculate_slave(internals);
                rte_eth_macaddr_get(client_info->slave_idx, &client_info->app_mac);
-               ether_addr_copy(&client_info->app_mac, &arp->arp_data.arp_sha);
+               rte_ether_addr_copy(&client_info->app_mac, &arp->arp_data.arp_sha);
                memcpy(client_info->vlan, eth_h + 1, offset);
                client_info->vlan_count = offset / sizeof(struct rte_vlan_hdr);
                rte_spinlock_unlock(&internals->mode6.lock);
@@ -202,8 +202,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 *);
 
-       ether_addr_copy(&client_info->app_mac, &eth_h->s_addr);
-       ether_addr_copy(&client_info->cli_mac, &eth_h->d_addr);
+       rte_ether_addr_copy(&client_info->app_mac, &eth_h->s_addr);
+       rte_ether_addr_copy(&client_info->cli_mac, &eth_h->d_addr);
        if (client_info->vlan_count > 0)
                eth_h->ether_type = rte_cpu_to_be_16(ETHER_TYPE_VLAN);
        else
@@ -215,9 +215,9 @@ bond_mode_alb_arp_upd(struct client_data *client_info,
        memcpy(eth_h + 1, client_info->vlan,
                        client_info->vlan_count * sizeof(struct rte_vlan_hdr));
 
-       ether_addr_copy(&client_info->app_mac, &arp_h->arp_data.arp_sha);
+       rte_ether_addr_copy(&client_info->app_mac, &arp_h->arp_data.arp_sha);
        arp_h->arp_data.arp_sip = client_info->app_ip;
-       ether_addr_copy(&client_info->cli_mac, &arp_h->arp_data.arp_tha);
+       rte_ether_addr_copy(&client_info->cli_mac, &arp_h->arp_data.arp_tha);
        arp_h->arp_data.arp_tip = client_info->cli_ip;
 
        arp_h->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER);
index 2eda2f7..7731736 100644 (file)
@@ -450,8 +450,8 @@ bond_ethdev_rx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
                         * mode and packet address does not match. */
                        if (unlikely(is_lacp_packets(hdr->ether_type, subtype, bufs[j]) ||
                                !collecting || (!promisc &&
-                                       !is_multicast_ether_addr(&hdr->d_addr) &&
-                                       !is_same_ether_addr(&bond_mac, &hdr->d_addr)))) {
+                                       !rte_is_multicast_ether_addr(&hdr->d_addr) &&
+                                       !rte_is_same_ether_addr(&bond_mac, &hdr->d_addr)))) {
 
                                if (hdr->ether_type == ether_type_slow_be) {
                                        bond_mode_8023ad_handle_slow_pkt(
@@ -1012,7 +1012,7 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                                sizeof(internals->tlb_slaves_order[0]) * num_of_slaves);
 
 
-       ether_addr_copy(primary_port->data->mac_addrs, &primary_slave_addr);
+       rte_ether_addr_copy(primary_port->data->mac_addrs, &primary_slave_addr);
 
        if (nb_pkts > 3) {
                for (i = 0; i < 3; i++)
@@ -1026,8 +1026,8 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                                rte_prefetch0(rte_pktmbuf_mtod(bufs[j+3], void*));
 
                        ether_hdr = rte_pktmbuf_mtod(bufs[j], struct rte_ether_hdr *);
-                       if (is_same_ether_addr(&ether_hdr->s_addr, &primary_slave_addr))
-                               ether_addr_copy(&active_slave_addr, &ether_hdr->s_addr);
+                       if (rte_is_same_ether_addr(&ether_hdr->s_addr, &primary_slave_addr))
+                               rte_ether_addr_copy(&active_slave_addr, &ether_hdr->s_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
@@ -1507,7 +1507,7 @@ mac_address_get(struct rte_eth_dev *eth_dev, struct rte_ether_addr *dst_mac_addr
 
        mac_addr = eth_dev->data->mac_addrs;
 
-       ether_addr_copy(mac_addr, dst_mac_addr);
+       rte_ether_addr_copy(mac_addr, dst_mac_addr);
        return 0;
 }
 
@@ -1549,7 +1549,7 @@ slave_add_mac_addresses(struct rte_eth_dev *bonded_eth_dev,
 
        for (i = 1; i < BOND_MAX_MAC_ADDRS; i++) {
                mac_addr = &bonded_eth_dev->data->mac_addrs[i];
-               if (is_same_ether_addr(mac_addr, &null_mac_addr))
+               if (rte_is_same_ether_addr(mac_addr, &null_mac_addr))
                        break;
 
                ret = rte_eth_dev_mac_addr_add(slave_port_id, mac_addr, 0);
@@ -1578,7 +1578,7 @@ slave_remove_mac_addresses(struct rte_eth_dev *bonded_eth_dev,
        rc = 0;
        for (i = 1; i < BOND_MAX_MAC_ADDRS; i++) {
                mac_addr = &bonded_eth_dev->data->mac_addrs[i];
-               if (is_same_ether_addr(mac_addr, &null_mac_addr))
+               if (rte_is_same_ether_addr(mac_addr, &null_mac_addr))
                        break;
 
                ret = rte_eth_dev_mac_addr_remove(slave_port_id, mac_addr);
index fc0af49..7c43e12 100644 (file)
@@ -671,7 +671,7 @@ static inline void t4_os_set_hw_addr(struct adapter *adapter, int port_idx,
 {
        struct port_info *pi = adap2pinfo(adapter, port_idx);
 
-       ether_addr_copy((struct rte_ether_addr *)hw_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)hw_addr,
                        &pi->eth_dev->data->mac_addrs[0]);
 }
 
index ccd165b..13de577 100644 (file)
@@ -117,12 +117,12 @@ ch_rte_parsetype_eth(const void *dmask, const struct rte_flow_item *item,
        mask = umask ? umask : (const struct rte_flow_item_eth *)dmask;
 
        /* we don't support SRC_MAC filtering*/
-       if (!is_zero_ether_addr(&mask->src))
+       if (!rte_is_zero_ether_addr(&mask->src))
                return rte_flow_error_set(e, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM,
                                          item,
                                          "src mac filtering not supported");
 
-       if (!is_zero_ether_addr(&mask->dst)) {
+       if (!rte_is_zero_ether_addr(&mask->dst)) {
                const u8 *addr = (const u8 *)&spec->dst.addr_bytes[0];
                const u8 *m = (const u8 *)&mask->dst.addr_bytes[0];
                struct rte_flow *flow = (struct rte_flow *)fs->private;
index 9aaabf4..704bbf0 100644 (file)
@@ -1360,7 +1360,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* copy the primary mac address */
-       ether_addr_copy(&fman_intf->mac_addr, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(&fman_intf->mac_addr, &eth_dev->data->mac_addrs[0]);
 
        RTE_LOG(INFO, PMD, "net: dpaa: %s: %02x:%02x:%02x:%02x:%02x:%02x\n",
                dpaa_device->name,
index dcfc1a9..244099a 100644 (file)
@@ -1872,9 +1872,9 @@ populate_mac_addr(struct fsl_mc_io *dpni_dev, struct dpaa2_dev_priv *priv,
         *  If empty_mac(phy), return prime.
         *  if both are empty, create random MAC, set as prime and return
         */
-       if (!is_zero_ether_addr(&phy_mac)) {
+       if (!rte_is_zero_ether_addr(&phy_mac)) {
                /* If the addresses are not same, overwrite prime */
-               if (!is_same_ether_addr(&phy_mac, &prime_mac)) {
+               if (!rte_is_same_ether_addr(&phy_mac, &prime_mac)) {
                        ret = dpni_set_primary_mac_addr(dpni_dev, CMD_PRI_LOW,
                                                        priv->token,
                                                        phy_mac.addr_bytes);
@@ -1885,9 +1885,9 @@ populate_mac_addr(struct fsl_mc_io *dpni_dev, struct dpaa2_dev_priv *priv,
                        }
                        memcpy(&prime_mac, &phy_mac, sizeof(struct rte_ether_addr));
                }
-       } else if (is_zero_ether_addr(&prime_mac)) {
+       } else if (rte_is_zero_ether_addr(&prime_mac)) {
                /* In case phys and prime, both are zero, create random MAC */
-               eth_random_addr(prime_mac.addr_bytes);
+               rte_eth_random_addr(prime_mac.addr_bytes);
                ret = dpni_set_primary_mac_addr(dpni_dev, CMD_PRI_LOW,
                                                priv->token,
                                                prime_mac.addr_bytes);
index b4bb135..4d86153 100644 (file)
@@ -293,7 +293,7 @@ eth_em_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct rte_ether_addr *) hw->mac.addr,
+       rte_ether_addr_copy((struct rte_ether_addr *) hw->mac.addr,
                eth_dev->data->mac_addrs);
 
        /* initialize the vfta */
index 210e5c3..7621846 100644 (file)
@@ -819,7 +819,7 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct rte_ether_addr *)hw->mac.addr, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.addr, &eth_dev->data->mac_addrs[0]);
 
        /* initialize the vfta */
        memset(shadow_vfta, 0, sizeof(*shadow_vfta));
@@ -1019,8 +1019,8 @@ eth_igbvf_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* Generate a random MAC address, if none was assigned by PF. */
-       if (is_zero_ether_addr(perm_addr)) {
-               eth_random_addr(perm_addr->addr_bytes);
+       if (rte_is_zero_ether_addr(perm_addr)) {
+               rte_eth_random_addr(perm_addr->addr_bytes);
                PMD_INIT_LOG(INFO, "\tVF MAC address not assigned by Host PF");
                PMD_INIT_LOG(INFO, "\tAssign randomly generated MAC address "
                             "%02x:%02x:%02x:%02x:%02x:%02x",
@@ -1039,7 +1039,7 @@ eth_igbvf_dev_init(struct rte_eth_dev *eth_dev)
                return diag;
        }
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct rte_ether_addr *) hw->mac.perm_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *) hw->mac.perm_addr,
                        &eth_dev->data->mac_addrs[0]);
 
        PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x "
index 3368349..8dcfc71 100644 (file)
@@ -548,9 +548,9 @@ cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
         * Mask bits of destination MAC address must be full
         * of 1 or full of 0.
         */
-       if (!is_zero_ether_addr(&eth_mask->src) ||
-           (!is_zero_ether_addr(&eth_mask->dst) &&
-            !is_broadcast_ether_addr(&eth_mask->dst))) {
+       if (!rte_is_zero_ether_addr(&eth_mask->src) ||
+           (!rte_is_zero_ether_addr(&eth_mask->dst) &&
+            !rte_is_broadcast_ether_addr(&eth_mask->dst))) {
                rte_flow_error_set(error, EINVAL,
                                RTE_FLOW_ERROR_TYPE_ITEM,
                                item, "Invalid ether address mask");
@@ -567,7 +567,7 @@ cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
        /* If mask bits of destination MAC address
         * are full of 1, set RTE_ETHTYPE_FLAGS_MAC.
         */
-       if (is_broadcast_ether_addr(&eth_mask->dst)) {
+       if (rte_is_broadcast_ether_addr(&eth_mask->dst)) {
                filter->mac_addr = eth_spec->dst;
                filter->flags |= RTE_ETHTYPE_FLAGS_MAC;
        } else {
index 9f15213..ab48a26 100644 (file)
@@ -43,7 +43,7 @@ int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
        uint16_t vfn;
 
        for (vfn = 0; vfn < vf_num; vfn++) {
-               eth_random_addr(vf_mac_addr);
+               rte_eth_random_addr(vf_mac_addr);
                /* keep the random address as default */
                memcpy(vfinfo[vfn].vf_mac_addresses, vf_mac_addr,
                                ETHER_ADDR_LEN);
@@ -306,8 +306,8 @@ igb_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
        uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);
        int rah;
 
-       if (is_unicast_ether_addr((struct rte_ether_addr *)new_mac)) {
-               if (!is_zero_ether_addr((struct rte_ether_addr *)new_mac))
+       if (rte_is_unicast_ether_addr((struct rte_ether_addr *)new_mac)) {
+               if (!rte_is_zero_ether_addr((struct rte_ether_addr *)new_mac))
                        rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac,
                                sizeof(vfinfo[vf].vf_mac_addresses));
                hw->mac.ops.rar_set(hw, new_mac, rar_entry);
index 165ff52..7bf8dd4 100644 (file)
@@ -1656,7 +1656,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
 
        /* Copy MAC address and point DPDK to it */
        eth_dev->data->mac_addrs = (struct rte_ether_addr *)adapter->mac_addr;
-       ether_addr_copy((struct rte_ether_addr *)get_feat_ctx.dev_attr.mac_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)get_feat_ctx.dev_attr.mac_addr,
                        (struct rte_ether_addr *)adapter->mac_addr);
 
        adapter->drv_stats = rte_zmalloc("adapter stats",
index 1541368..8b2b473 100644 (file)
@@ -98,7 +98,7 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct rte_ether_addr *)hw->mac.addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.addr,
                        &eth_dev->data->mac_addrs[0]);
 
        ENETC_PMD_DEBUG("port_id %d vendorID=0x%x deviceID=0x%x",
index e362219..f3eec25 100644 (file)
@@ -1675,7 +1675,7 @@ static int enic_dev_init(struct enic *enic)
                dev_err(enic, "mac addr storage alloc failed, aborting.\n");
                return -1;
        }
-       ether_addr_copy((struct rte_ether_addr *) enic->mac_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *) enic->mac_addr,
                        eth_dev->data->mac_addrs);
 
        vnic_dev_set_reset_flag(enic->vdev, 0);
index 495f536..d1fcb5f 100644 (file)
@@ -245,7 +245,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                 */
                FOREACH_SUBDEV(sdev, i, dev)
                        if (sdev->state >= DEV_PROBED) {
-                               ether_addr_copy(&ETH(sdev)->data->mac_addrs[0],
+                               rte_ether_addr_copy(&ETH(sdev)->data->mac_addrs[0],
                                                mac);
                                break;
                        }
@@ -257,7 +257,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                 * probed slaves.
                 */
                if (i == priv->subs_tail)
-                       eth_random_addr(&mac->addr_bytes[0]);
+                       rte_eth_random_addr(&mac->addr_bytes[0]);
        }
        INFO("MAC address is %02x:%02x:%02x:%02x:%02x:%02x",
                mac->addr_bytes[0], mac->addr_bytes[1],
index a7f2b0e..ff39ece 100644 (file)
@@ -174,7 +174,7 @@ fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
                if (ret) {
                        char ea_fmt[ETHER_ADDR_FMT_SIZE];
 
-                       ether_format_addr(ea_fmt, ETHER_ADDR_FMT_SIZE, ea);
+                       rte_ether_format_addr(ea_fmt, ETHER_ADDR_FMT_SIZE, ea);
                        ERROR("Adding MAC address %s failed", ea_fmt);
                        return ret;
                }
index eb3e130..e1bff39 100644 (file)
@@ -619,7 +619,7 @@ fm10k_dev_mq_rx_configure(struct rte_eth_dev *dev)
        /* reset MAC/VLAN as it's based on VMDQ or PF main VSI */
        memset(dev->data->mac_addrs, 0,
                ETHER_ADDR_LEN * FM10K_MAX_MACADDR_NUM);
-       ether_addr_copy((const struct rte_ether_addr *)hw->mac.addr,
+       rte_ether_addr_copy((const struct rte_ether_addr *)hw->mac.addr,
                &dev->data->mac_addrs[0]);
        memset(macvlan, 0, sizeof(*macvlan));
        macvlan->nb_queue_pools = nb_queue_pools;
@@ -1530,7 +1530,7 @@ fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 
        for (mac_index = 0; (mac_index < FM10K_MAX_MACADDR_NUM) &&
                        (result == FM10K_SUCCESS); mac_index++) {
-               if (is_zero_ether_addr(&data->mac_addrs[mac_index]))
+               if (rte_is_zero_ether_addr(&data->mac_addrs[mac_index]))
                        continue;
                if (mac_num > macvlan->mac_num - 1) {
                        PMD_INIT_LOG(ERR, "MAC address number "
@@ -3084,16 +3084,16 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
 
        diag = fm10k_read_mac_addr(hw);
 
-       ether_addr_copy((const struct rte_ether_addr *)hw->mac.addr,
+       rte_ether_addr_copy((const struct rte_ether_addr *)hw->mac.addr,
                        &dev->data->mac_addrs[0]);
 
        if (diag != FM10K_SUCCESS ||
-               !is_valid_assigned_ether_addr(dev->data->mac_addrs)) {
+               !rte_is_valid_assigned_ether_addr(dev->data->mac_addrs)) {
 
                /* Generate a random addr */
-               eth_random_addr(hw->mac.addr);
+               rte_eth_random_addr(hw->mac.addr);
                memcpy(hw->mac.perm_addr, hw->mac.addr, ETH_ALEN);
-               ether_addr_copy((const struct rte_ether_addr *)hw->mac.addr,
+               rte_ether_addr_copy((const struct rte_ether_addr *)hw->mac.addr,
                &dev->data->mac_addrs[0]);
        }
 
index fa2e39a..895b3d6 100644 (file)
@@ -1457,7 +1457,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
                goto err_get_mac_addr;
        }
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct rte_ether_addr *) hw->mac.addr,
+       rte_ether_addr_copy((struct rte_ether_addr *) hw->mac.addr,
                        (struct rte_ether_addr *) hw->mac.perm_addr);
 
        /* Disable flow control */
@@ -1512,7 +1512,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
                        "Failed to allocated memory for storing mac address");
                goto err_mac_alloc;
        }
-       ether_addr_copy((struct rte_ether_addr *)hw->mac.perm_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.perm_addr,
                                        &dev->data->mac_addrs[0]);
 
        /* Init dcb to sw mode by default */
@@ -4055,7 +4055,7 @@ i40e_vf_mac_filter_set(struct i40e_pf *pf,
 
        new_mac = &filter->mac_addr;
 
-       if (is_zero_ether_addr(new_mac)) {
+       if (rte_is_zero_ether_addr(new_mac)) {
                PMD_DRV_LOG(ERR, "Invalid ethernet address.");
                return -EINVAL;
        }
@@ -4068,7 +4068,7 @@ i40e_vf_mac_filter_set(struct i40e_pf *pf,
        }
        vf = &pf->vfs[vf_id];
 
-       if (add && is_same_ether_addr(new_mac, &(pf->dev_addr))) {
+       if (add && rte_is_same_ether_addr(new_mac, &(pf->dev_addr))) {
                PMD_DRV_LOG(INFO, "Ignore adding permanent MAC address.");
                return -EINVAL;
        }
@@ -4086,7 +4086,7 @@ i40e_vf_mac_filter_set(struct i40e_pf *pf,
                        PMD_DRV_LOG(ERR, "Failed to add MAC filter.");
                        return -1;
                }
-               ether_addr_copy(new_mac, &pf->dev_addr);
+               rte_ether_addr_copy(new_mac, &pf->dev_addr);
        } else {
                rte_memcpy(hw->mac.addr, hw->mac.perm_addr,
                                ETHER_ADDR_LEN);
@@ -4097,7 +4097,7 @@ i40e_vf_mac_filter_set(struct i40e_pf *pf,
                }
 
                /* Clear device address as it has been removed */
-               if (is_same_ether_addr(&(pf->dev_addr), new_mac))
+               if (rte_is_same_ether_addr(&(pf->dev_addr), new_mac))
                        memset(&pf->dev_addr, 0, sizeof(struct rte_ether_addr));
        }
 
@@ -6841,7 +6841,7 @@ i40e_find_mac_filter(struct i40e_vsi *vsi,
        struct i40e_mac_filter *f;
 
        TAILQ_FOREACH(f, &vsi->mac_list, next) {
-               if (is_same_ether_addr(macaddr, &f->mac_info.mac_addr))
+               if (rte_is_same_ether_addr(macaddr, &f->mac_info.mac_addr))
                        return f;
        }
 
@@ -7508,9 +7508,9 @@ i40e_tunnel_filter_convert(
        struct i40e_aqc_cloud_filters_element_bb *cld_filter,
        struct i40e_tunnel_filter *tunnel_filter)
 {
-       ether_addr_copy((struct rte_ether_addr *)&cld_filter->element.outer_mac,
+       rte_ether_addr_copy((struct rte_ether_addr *)&cld_filter->element.outer_mac,
                        (struct rte_ether_addr *)&tunnel_filter->input.outer_mac);
-       ether_addr_copy((struct rte_ether_addr *)&cld_filter->element.inner_mac,
+       rte_ether_addr_copy((struct rte_ether_addr *)&cld_filter->element.inner_mac,
                        (struct rte_ether_addr *)&tunnel_filter->input.inner_mac);
        tunnel_filter->input.inner_vlan = cld_filter->element.inner_vlan;
        if ((rte_le_to_cpu_16(cld_filter->element.flags) &
@@ -7619,9 +7619,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
        }
        pfilter = cld_filter;
 
-       ether_addr_copy(&tunnel_filter->outer_mac,
+       rte_ether_addr_copy(&tunnel_filter->outer_mac,
                        (struct rte_ether_addr *)&pfilter->element.outer_mac);
-       ether_addr_copy(&tunnel_filter->inner_mac,
+       rte_ether_addr_copy(&tunnel_filter->inner_mac,
                        (struct rte_ether_addr *)&pfilter->element.inner_mac);
 
        pfilter->element.inner_vlan =
@@ -8063,9 +8063,9 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf,
        }
        pfilter = cld_filter;
 
-       ether_addr_copy(&tunnel_filter->outer_mac,
+       rte_ether_addr_copy(&tunnel_filter->outer_mac,
                        (struct rte_ether_addr *)&pfilter->element.outer_mac);
-       ether_addr_copy(&tunnel_filter->inner_mac,
+       rte_ether_addr_copy(&tunnel_filter->inner_mac,
                        (struct rte_ether_addr *)&pfilter->element.inner_mac);
 
        pfilter->element.inner_vlan =
@@ -8538,13 +8538,13 @@ i40e_tunnel_filter_param_check(struct i40e_pf *pf,
        }
 
        if ((filter->filter_type & ETH_TUNNEL_FILTER_OMAC) &&
-               (is_zero_ether_addr(&filter->outer_mac))) {
+               (rte_is_zero_ether_addr(&filter->outer_mac))) {
                PMD_DRV_LOG(ERR, "Cannot add NULL outer MAC address");
                return -EINVAL;
        }
 
        if ((filter->filter_type & ETH_TUNNEL_FILTER_IMAC) &&
-               (is_zero_ether_addr(&filter->inner_mac))) {
+               (rte_is_zero_ether_addr(&filter->inner_mac))) {
                PMD_DRV_LOG(ERR, "Cannot add NULL inner MAC address");
                return -EINVAL;
        }
@@ -11844,13 +11844,13 @@ static int i40e_set_default_mac_addr(struct rte_eth_dev *dev,
        struct i40e_mac_filter *f;
        int ret;
 
-       if (!is_valid_assigned_ether_addr(mac_addr)) {
+       if (!rte_is_valid_assigned_ether_addr(mac_addr)) {
                PMD_DRV_LOG(ERR, "Tried to set invalid MAC address.");
                return -EINVAL;
        }
 
        TAILQ_FOREACH(f, &vsi->mac_list, next) {
-               if (is_same_ether_addr(&pf->dev_addr, &f->mac_info.mac_addr))
+               if (rte_is_same_ether_addr(&pf->dev_addr, &f->mac_info.mac_addr))
                        break;
        }
 
@@ -11968,9 +11968,9 @@ i40e_tunnel_filter_restore(struct i40e_pf *pf)
                        vsi = vf->vsi;
                }
                memset(&cld_filter, 0, sizeof(cld_filter));
-               ether_addr_copy((struct rte_ether_addr *)&f->input.outer_mac,
+               rte_ether_addr_copy((struct rte_ether_addr *)&f->input.outer_mac,
                        (struct rte_ether_addr *)&cld_filter.element.outer_mac);
-               ether_addr_copy((struct rte_ether_addr *)&f->input.inner_mac,
+               rte_ether_addr_copy((struct rte_ether_addr *)&f->input.inner_mac,
                        (struct rte_ether_addr *)&cld_filter.element.inner_mac);
                cld_filter.element.inner_vlan = f->input.inner_vlan;
                cld_filter.element.flags = f->input.flags;
index 601ffdc..22d18c7 100644 (file)
@@ -765,7 +765,7 @@ i40evf_add_mac_addr(struct rte_eth_dev *dev,
        int err;
        struct vf_cmd_info args;
 
-       if (is_zero_ether_addr(addr)) {
+       if (rte_is_zero_ether_addr(addr)) {
                PMD_DRV_LOG(ERR, "Invalid mac:%x:%x:%x:%x:%x:%x",
                            addr->addr_bytes[0], addr->addr_bytes[1],
                            addr->addr_bytes[2], addr->addr_bytes[3],
@@ -1223,10 +1223,10 @@ i40evf_init_vf(struct rte_eth_dev *dev)
        vf->vsi.adapter = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
 
        /* Store the MAC address configured by host, or generate random one */
-       if (is_valid_assigned_ether_addr((struct rte_ether_addr *)hw->mac.addr))
+       if (rte_is_valid_assigned_ether_addr((struct rte_ether_addr *)hw->mac.addr))
                vf->flags |= I40E_FLAG_VF_MAC_BY_PF;
        else
-               eth_random_addr(hw->mac.addr); /* Generate a random one */
+               rte_eth_random_addr(hw->mac.addr); /* Generate a random one */
 
        I40E_WRITE_REG(hw, I40E_VFINT_DYN_CTL01,
                       (I40E_ITR_INDEX_DEFAULT <<
@@ -1460,7 +1460,7 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
                                ETHER_ADDR_LEN * I40E_NUM_MACADDR_MAX);
                return -ENOMEM;
        }
-       ether_addr_copy((struct rte_ether_addr *)hw->mac.addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.addr,
                        &eth_dev->data->mac_addrs[0]);
 
        return 0;
@@ -1872,7 +1872,7 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)
                j = 0;
                len = sizeof(struct virtchnl_ether_addr_list);
                for (i = begin; i < I40E_NUM_MACADDR_MAX; i++, next_begin++) {
-                       if (is_zero_ether_addr(&dev->data->mac_addrs[i]))
+                       if (rte_is_zero_ether_addr(&dev->data->mac_addrs[i]))
                                continue;
                        len += sizeof(struct virtchnl_ether_addr);
                        if (len >= I40E_AQ_BUF_SZ) {
@@ -1889,7 +1889,7 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)
 
                for (i = begin; i < next_begin; i++) {
                        addr = &dev->data->mac_addrs[i];
-                       if (is_zero_ether_addr(addr))
+                       if (rte_is_zero_ether_addr(addr))
                                continue;
                        rte_memcpy(list->list[j].addr, addr->addr_bytes,
                                         sizeof(addr->addr_bytes));
@@ -2639,7 +2639,7 @@ i40evf_set_default_mac_addr(struct rte_eth_dev *dev,
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-       if (!is_valid_assigned_ether_addr(mac_addr)) {
+       if (!rte_is_valid_assigned_ether_addr(mac_addr)) {
                PMD_DRV_LOG(ERR, "Tried to set invalid MAC address.");
                return -EINVAL;
        }
@@ -2652,7 +2652,7 @@ i40evf_set_default_mac_addr(struct rte_eth_dev *dev,
        if (i40evf_add_mac_addr(dev, mac_addr, 0, 0) != 0)
                return -EIO;
 
-       ether_addr_copy(mac_addr, (struct rte_ether_addr *)hw->mac.addr);
+       rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)hw->mac.addr);
        return 0;
 }
 
index 210552e..f5813e9 100644 (file)
@@ -2007,9 +2007,9 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev,
                         * Mask bits of destination MAC address must be full
                         * of 1 or full of 0.
                         */
-                       if (!is_zero_ether_addr(&eth_mask->src) ||
-                           (!is_zero_ether_addr(&eth_mask->dst) &&
-                            !is_broadcast_ether_addr(&eth_mask->dst))) {
+                       if (!rte_is_zero_ether_addr(&eth_mask->src) ||
+                           (!rte_is_zero_ether_addr(&eth_mask->dst) &&
+                            !rte_is_broadcast_ether_addr(&eth_mask->dst))) {
                                rte_flow_error_set(error, EINVAL,
                                                   RTE_FLOW_ERROR_TYPE_ITEM,
                                                   item,
@@ -2028,7 +2028,7 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev,
                        /* If mask bits of destination MAC address
                         * are full of 1, set RTE_ETHTYPE_FLAGS_MAC.
                         */
-                       if (is_broadcast_ether_addr(&eth_mask->dst)) {
+                       if (rte_is_broadcast_ether_addr(&eth_mask->dst)) {
                                filter->mac_addr = eth_spec->dst;
                                filter->flags |= RTE_ETHTYPE_FLAGS_MAC;
                        } else {
@@ -2485,8 +2485,8 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
                        eth_mask = item->mask;
 
                        if (eth_spec && eth_mask) {
-                               if (!is_zero_ether_addr(&eth_mask->src) ||
-                                   !is_zero_ether_addr(&eth_mask->dst)) {
+                               if (!rte_is_zero_ether_addr(&eth_mask->src) ||
+                                   !rte_is_zero_ether_addr(&eth_mask->dst)) {
                                        rte_flow_error_set(error, EINVAL,
                                                      RTE_FLOW_ERROR_TYPE_ITEM,
                                                      item,
@@ -3326,8 +3326,8 @@ i40e_flow_parse_vxlan_pattern(__rte_unused struct rte_eth_dev *dev,
                                /* DST address of inner MAC shouldn't be masked.
                                 * SRC address of Inner MAC should be masked.
                                 */
-                               if (!is_broadcast_ether_addr(&eth_mask->dst) ||
-                                   !is_zero_ether_addr(&eth_mask->src) ||
+                               if (!rte_is_broadcast_ether_addr(&eth_mask->dst) ||
+                                   !rte_is_zero_ether_addr(&eth_mask->src) ||
                                    eth_mask->type) {
                                        rte_flow_error_set(error, EINVAL,
                                                   RTE_FLOW_ERROR_TYPE_ITEM,
@@ -3556,8 +3556,8 @@ i40e_flow_parse_nvgre_pattern(__rte_unused struct rte_eth_dev *dev,
                                /* DST address of inner MAC shouldn't be masked.
                                 * SRC address of Inner MAC should be masked.
                                 */
-                               if (!is_broadcast_ether_addr(&eth_mask->dst) ||
-                                   !is_zero_ether_addr(&eth_mask->src) ||
+                               if (!rte_is_broadcast_ether_addr(&eth_mask->dst) ||
+                                   !rte_is_zero_ether_addr(&eth_mask->src) ||
                                    eth_mask->type) {
                                        rte_flow_error_set(error, EINVAL,
                                                   RTE_FLOW_ERROR_TYPE_ITEM,
@@ -4803,9 +4803,9 @@ i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf,
        int ret = 0;
 
        memset(&cld_filter, 0, sizeof(cld_filter));
-       ether_addr_copy((struct rte_ether_addr *)&filter->input.outer_mac,
+       rte_ether_addr_copy((struct rte_ether_addr *)&filter->input.outer_mac,
                        (struct rte_ether_addr *)&cld_filter.element.outer_mac);
-       ether_addr_copy((struct rte_ether_addr *)&filter->input.inner_mac,
+       rte_ether_addr_copy((struct rte_ether_addr *)&filter->input.inner_mac,
                        (struct rte_ether_addr *)&cld_filter.element.inner_mac);
        cld_filter.element.inner_vlan = filter->input.inner_vlan;
        cld_filter.element.flags = filter->input.flags;
index 5b77fa7..de619dd 100644 (file)
@@ -348,7 +348,7 @@ i40e_pf_host_process_cmd_get_vf_resource(struct i40e_pf_vf *vf, uint8_t *msg,
        vf_res->vsi_res[0].vsi_type = VIRTCHNL_VSI_SRIOV;
        vf_res->vsi_res[0].vsi_id = vf->vsi->vsi_id;
        vf_res->vsi_res[0].num_queue_pairs = vf->vsi->nb_qps;
-       ether_addr_copy(&vf->mac_addr,
+       rte_ether_addr_copy(&vf->mac_addr,
                (struct rte_ether_addr *)vf_res->vsi_res[0].default_mac_addr);
 
 send_msg:
@@ -845,7 +845,7 @@ i40e_pf_host_process_cmd_add_ether_address(struct i40e_pf_vf *vf,
                mac = (struct rte_ether_addr *)(addr_list->list[i].addr);
                rte_memcpy(&filter.mac_addr, mac, ETHER_ADDR_LEN);
                filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
-               if (is_zero_ether_addr(mac) ||
+               if (rte_is_zero_ether_addr(mac) ||
                    i40e_vsi_add_mac(vf->vsi, &filter)) {
                        ret = I40E_ERR_INVALID_MAC_ADDR;
                        goto send_msg;
@@ -887,7 +887,7 @@ i40e_pf_host_process_cmd_del_ether_address(struct i40e_pf_vf *vf,
 
        for (i = 0; i < addr_list->num_elements; i++) {
                mac = (struct rte_ether_addr *)(addr_list->list[i].addr);
-               if(is_zero_ether_addr(mac) ||
+               if(rte_is_zero_ether_addr(mac) ||
                        i40e_vsi_delete_mac(vf->vsi, mac)) {
                        ret = I40E_ERR_INVALID_MAC_ADDR;
                        goto send_msg;
index e7b3336..6981d33 100644 (file)
@@ -559,7 +559,7 @@ rte_pmd_i40e_set_vf_mac_addr(uint16_t port, uint16_t vf_id,
                return -EINVAL;
        }
 
-       ether_addr_copy(mac_addr, &vf->mac_addr);
+       rte_ether_addr_copy(mac_addr, &vf->mac_addr);
 
        /* Remove all existing mac */
        TAILQ_FOREACH_SAFE(f, &vsi->mac_list, next, temp)
@@ -603,9 +603,9 @@ rte_pmd_i40e_remove_vf_mac_addr(uint16_t port, uint16_t vf_id,
                return -EINVAL;
        }
 
-       if (is_same_ether_addr(mac_addr, &vf->mac_addr))
+       if (rte_is_same_ether_addr(mac_addr, &vf->mac_addr))
                /* Reset the mac with NULL address */
-               ether_addr_copy(&null_mac_addr, &vf->mac_addr);
+               rte_ether_addr_copy(&null_mac_addr, &vf->mac_addr);
 
        /* Remove the mac */
        i40e_vsi_delete_mac(vsi, mac_addr);
@@ -2386,7 +2386,7 @@ rte_pmd_i40e_add_vf_mac_addr(uint16_t port, uint16_t vf_id,
        }
 
        mac_filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
-       ether_addr_copy(mac_addr, &mac_filter.mac_addr);
+       rte_ether_addr_copy(mac_addr, &mac_filter.mac_addr);
        ret = i40e_vsi_add_mac(vsi, &mac_filter);
        if (ret != I40E_SUCCESS) {
                PMD_DRV_LOG(ERR, "Failed to add MAC filter.");
@@ -2513,7 +2513,7 @@ rte_pmd_i40e_query_vfid_by_mac(uint16_t port, const struct rte_ether_addr *vf_ma
                vf = &pf->vfs[vf_id];
                mac = &vf->mac_addr;
 
-               if (is_same_ether_addr(mac, vf_mac))
+               if (rte_is_same_ether_addr(mac, vf_mac))
                        return vf_id;
        }
 
index e7e1bae..bd10b40 100644 (file)
@@ -1215,7 +1215,7 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
                return -ENOMEM;
        }
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct rte_ether_addr *) hw->mac.perm_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *) hw->mac.perm_addr,
                        &eth_dev->data->mac_addrs[0]);
 
        /* Allocate memory for storing hash filter MAC addresses */
@@ -1651,7 +1651,7 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* Generate a random MAC address, if none was assigned by PF. */
-       if (is_zero_ether_addr(perm_addr)) {
+       if (rte_is_zero_ether_addr(perm_addr)) {
                generate_random_mac_addr(perm_addr);
                diag = ixgbe_set_rar_vf(hw, 1, perm_addr->addr_bytes, 0, 1);
                if (diag) {
@@ -1671,7 +1671,7 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
        }
 
        /* Copy the permanent MAC address */
-       ether_addr_copy(perm_addr, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(perm_addr, &eth_dev->data->mac_addrs[0]);
 
        /* reset the hardware with the new settings */
        diag = hw->mac.ops.start_hw(hw);
@@ -6037,7 +6037,7 @@ ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index)
                if (i == index)
                        continue;
                /* Skip NULL MAC addresses */
-               if (is_zero_ether_addr(mac_addr))
+               if (rte_is_zero_ether_addr(mac_addr))
                        continue;
                /* Skip the permanent MAC address */
                if (memcmp(perm_addr, mac_addr, sizeof(struct rte_ether_addr)) == 0)
index 1adf1b8..ff9e6f4 100644 (file)
@@ -715,9 +715,9 @@ cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
         * Mask bits of destination MAC address must be full
         * of 1 or full of 0.
         */
-       if (!is_zero_ether_addr(&eth_mask->src) ||
-           (!is_zero_ether_addr(&eth_mask->dst) &&
-            !is_broadcast_ether_addr(&eth_mask->dst))) {
+       if (!rte_is_zero_ether_addr(&eth_mask->src) ||
+           (!rte_is_zero_ether_addr(&eth_mask->dst) &&
+            !rte_is_broadcast_ether_addr(&eth_mask->dst))) {
                rte_flow_error_set(error, EINVAL,
                                RTE_FLOW_ERROR_TYPE_ITEM,
                                item, "Invalid ether address mask");
@@ -734,7 +734,7 @@ cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
        /* If mask bits of destination MAC address
         * are full of 1, set RTE_ETHTYPE_FLAGS_MAC.
         */
-       if (is_broadcast_ether_addr(&eth_mask->dst)) {
+       if (rte_is_broadcast_ether_addr(&eth_mask->dst)) {
                filter->mac_addr = eth_spec->dst;
                filter->flags |= RTE_ETHTYPE_FLAGS_MAC;
        } else {
index 0840e14..e8089a0 100644 (file)
@@ -46,7 +46,7 @@ int ixgbe_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
        uint16_t vfn;
 
        for (vfn = 0; vfn < vf_num; vfn++) {
-               eth_random_addr(vf_mac_addr);
+               rte_eth_random_addr(vf_mac_addr);
                /* keep the random address as default */
                memcpy(vfinfo[vfn].vf_mac_addresses, vf_mac_addr,
                           ETHER_ADDR_LEN);
@@ -480,7 +480,7 @@ ixgbe_vf_set_mac_addr(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
        uint8_t *new_mac = (uint8_t *)(&msgbuf[1]);
 
-       if (is_valid_assigned_ether_addr((struct rte_ether_addr *)new_mac)) {
+       if (rte_is_valid_assigned_ether_addr((struct rte_ether_addr *)new_mac)) {
                rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac, 6);
                return hw->mac.ops.set_rar(hw, rar_entry, new_mac, vf, IXGBE_RAH_AV);
        }
index 3defba1..45fc3a4 100644 (file)
@@ -35,7 +35,7 @@ rte_pmd_ixgbe_set_vf_mac_addr(uint16_t port, uint16_t vf,
        vfinfo = *(IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private));
        rar_entry = hw->mac.num_rar_entries - (vf + 1);
 
-       if (is_valid_assigned_ether_addr((struct rte_ether_addr *)new_mac)) {
+       if (rte_is_valid_assigned_ether_addr((struct rte_ether_addr *)new_mac)) {
                rte_memcpy(vfinfo[vf].vf_mac_addresses, new_mac,
                           ETHER_ADDR_LEN);
                return hw->mac.ops.set_rar(hw, rar_entry, new_mac, vf,
index a78059c..0665198 100644 (file)
@@ -358,7 +358,7 @@ eth_kni_create(struct rte_vdev_device *vdev,
        data->dev_link = pmd_link;
        data->mac_addrs = &internals->eth_addr;
 
-       eth_random_addr(internals->eth_addr.addr_bytes);
+       rte_eth_random_addr(internals->eth_addr.addr_bytes);
 
        eth_dev->dev_ops = &eth_kni_ops;
 
index ddf6bf6..a2ff73c 100644 (file)
@@ -1834,7 +1834,7 @@ lio_dev_configure(struct rte_eth_dev *eth_dev)
                                       2 + i));
 
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct rte_ether_addr *)mac, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy((struct rte_ether_addr *)mac, &eth_dev->data->mac_addrs[0]);
 
        /* enable firmware checksum support for tunnel packets */
        lio_enable_hw_tunnel_rx_checksum(eth_dev);
index 087725d..5287b90 100644 (file)
@@ -1393,7 +1393,7 @@ next_vlan:
                        mac = &priv->mac[i];
                else
                        mac = &eth_mask.dst;
-               if (is_zero_ether_addr(mac))
+               if (rte_is_zero_ether_addr(mac))
                        continue;
                /* Check if MAC flow rule is already present. */
                for (flow = LIST_FIRST(&priv->flows);
index 9b2b127..024ae5e 100644 (file)
@@ -1727,7 +1727,7 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,
                                                 spec.eth->type);
                                eth_type_set = 1;
                        }
-                       if (!is_zero_ether_addr(&mask.eth->dst)) {
+                       if (!rte_is_zero_ether_addr(&mask.eth->dst)) {
                                mnl_attr_put(nlh, TCA_FLOWER_KEY_ETH_DST,
                                             ETHER_ADDR_LEN,
                                             spec.eth->dst.addr_bytes);
@@ -1735,7 +1735,7 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,
                                             ETHER_ADDR_LEN,
                                             mask.eth->dst.addr_bytes);
                        }
-                       if (!is_zero_ether_addr(&mask.eth->src)) {
+                       if (!rte_is_zero_ether_addr(&mask.eth->src)) {
                                mnl_attr_put(nlh, TCA_FLOWER_KEY_ETH_SRC,
                                             ETHER_ADDR_LEN,
                                             spec.eth->src.addr_bytes);
index cee52a5..fdfd46f 100644 (file)
@@ -71,7 +71,7 @@ mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
        const int vf = priv->config.vf;
 
        assert(index < MLX5_MAX_MAC_ADDRESSES);
-       if (is_zero_ether_addr(&dev->data->mac_addrs[index]))
+       if (rte_is_zero_ether_addr(&dev->data->mac_addrs[index]))
                return;
        if (vf)
                mlx5_nl_mac_addr_remove(dev, &dev->data->mac_addrs[index],
@@ -101,7 +101,7 @@ mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
        unsigned int i;
 
        assert(index < MLX5_MAX_MAC_ADDRESSES);
-       if (is_zero_ether_addr(mac)) {
+       if (rte_is_zero_ether_addr(mac)) {
                rte_errno = EINVAL;
                return -rte_errno;
        }
index a82c0cc..0fc4530 100644 (file)
@@ -333,7 +333,7 @@ mlx5_nl_mac_addr_cb(struct nlmsghdr *nh, void *arg)
 #ifndef NDEBUG
                        char m[18];
 
-                       ether_format_addr(m, 18, RTA_DATA(attribute));
+                       rte_ether_format_addr(m, 18, RTA_DATA(attribute));
                        DRV_LOG(DEBUG, "bridge MAC address %s", m);
 #endif
                        memcpy(&(*data->mac)[data->mac_n++],
@@ -548,14 +548,14 @@ mlx5_nl_mac_addr_sync(struct rte_eth_dev *dev)
 
                /* Verify the address is not in the array yet. */
                for (j = 0; j != MLX5_MAX_MAC_ADDRESSES; ++j)
-                       if (is_same_ether_addr(&macs[i],
+                       if (rte_is_same_ether_addr(&macs[i],
                                               &dev->data->mac_addrs[j]))
                                break;
                if (j != MLX5_MAX_MAC_ADDRESSES)
                        continue;
                /* Find the first entry available. */
                for (j = 0; j != MLX5_MAX_MAC_ADDRESSES; ++j) {
-                       if (is_zero_ether_addr(&dev->data->mac_addrs[j])) {
+                       if (rte_is_zero_ether_addr(&dev->data->mac_addrs[j])) {
                                dev->data->mac_addrs[j] = macs[i];
                                break;
                        }
index 8fd3441..9d719f1 100644 (file)
@@ -594,7 +594,7 @@ mvneta_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
        ret = neta_ppio_remove_mac_addr(priv->ppio,
                                       dev->data->mac_addrs[index].addr_bytes);
        if (ret) {
-               ether_format_addr(buf, sizeof(buf),
+               rte_ether_format_addr(buf, sizeof(buf),
                                  &dev->data->mac_addrs[index]);
                MVNETA_LOG(ERR, "Failed to remove mac %s", buf);
        }
@@ -632,7 +632,7 @@ mvneta_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
 
        ret = neta_ppio_add_mac_addr(priv->ppio, mac_addr->addr_bytes);
        if (ret) {
-               ether_format_addr(buf, sizeof(buf), mac_addr);
+               rte_ether_format_addr(buf, sizeof(buf), mac_addr);
                MVNETA_LOG(ERR, "Failed to add mac %s", buf);
                return -1;
        }
@@ -660,7 +660,7 @@ mvneta_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
        ret = neta_ppio_set_mac_addr(priv->ppio, mac_addr->addr_bytes);
        if (ret) {
                char buf[ETHER_ADDR_FMT_SIZE];
-               ether_format_addr(buf, sizeof(buf), mac_addr);
+               rte_ether_format_addr(buf, sizeof(buf), mac_addr);
                MVNETA_LOG(ERR, "Failed to set mac to %s", buf);
        }
        return 0;
index bffad9c..b06af77 100644 (file)
@@ -1079,7 +1079,7 @@ mrvl_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
        ret = pp2_ppio_remove_mac_addr(priv->ppio,
                                       dev->data->mac_addrs[index].addr_bytes);
        if (ret) {
-               ether_format_addr(buf, sizeof(buf),
+               rte_ether_format_addr(buf, sizeof(buf),
                                  &dev->data->mac_addrs[index]);
                MRVL_LOG(ERR, "Failed to remove mac %s", buf);
        }
@@ -1133,7 +1133,7 @@ mrvl_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
         */
        ret = pp2_ppio_add_mac_addr(priv->ppio, mac_addr->addr_bytes);
        if (ret) {
-               ether_format_addr(buf, sizeof(buf), mac_addr);
+               rte_ether_format_addr(buf, sizeof(buf), mac_addr);
                MRVL_LOG(ERR, "Failed to add mac %s", buf);
                return -1;
        }
@@ -1167,7 +1167,7 @@ mrvl_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
        ret = pp2_ppio_set_mac_addr(priv->ppio, mac_addr->addr_bytes);
        if (ret) {
                char buf[ETHER_ADDR_FMT_SIZE];
-               ether_format_addr(buf, sizeof(buf), mac_addr);
+               rte_ether_format_addr(buf, sizeof(buf), mac_addr);
                MRVL_LOG(ERR, "Failed to set mac to %s", buf);
        }
 
index a5cc952..38fa1da 100644 (file)
@@ -128,8 +128,8 @@ hn_update_packet_stats(struct hn_stats *stats, const struct rte_mbuf *m)
        }
 
        ea = rte_pktmbuf_mtod(m, const struct rte_ether_addr *);
-       if (is_multicast_ether_addr(ea)) {
-               if (is_broadcast_ether_addr(ea))
+       if (rte_is_multicast_ether_addr(ea)) {
+               if (rte_is_broadcast_ether_addr(ea))
                        stats->broadcast++;
                else
                        stats->multicast++;
index 96f9e54..4dad021 100644 (file)
@@ -36,7 +36,7 @@ static int hn_vf_match(const struct rte_eth_dev *dev)
        char buf[32];
        int i;
 
-       ether_format_addr(buf, sizeof(buf), mac);
+       rte_ether_format_addr(buf, sizeof(buf), mac);
        RTE_ETH_FOREACH_DEV(i) {
                const struct rte_eth_dev *vf_dev = &rte_eth_devices[i];
                const struct rte_ether_addr *vf_mac = vf_dev->data->mac_addrs;
@@ -44,8 +44,8 @@ static int hn_vf_match(const struct rte_eth_dev *dev)
                if (vf_dev == dev)
                        continue;
 
-               ether_format_addr(buf, sizeof(buf), vf_mac);
-               if (is_same_ether_addr(mac, vf_mac))
+               rte_ether_format_addr(buf, sizeof(buf), vf_mac);
+               if (rte_is_same_ether_addr(mac, vf_mac))
                        return i;
        }
        return -ENOENT;
index 56628b5..bfc5e08 100644 (file)
@@ -2888,16 +2888,16 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
                nfp_net_vf_read_mac(hw);
        }
 
-       if (!is_valid_assigned_ether_addr((struct rte_ether_addr *)&hw->mac_addr)) {
+       if (!rte_is_valid_assigned_ether_addr((struct rte_ether_addr *)&hw->mac_addr)) {
                PMD_INIT_LOG(INFO, "Using random mac address for port %d",
                                   port);
                /* Using random mac addresses for VFs */
-               eth_random_addr(&hw->mac_addr[0]);
+               rte_eth_random_addr(&hw->mac_addr[0]);
                nfp_net_write_mac(hw, (uint8_t *)&hw->mac_addr);
        }
 
        /* Copying mac address to DPDK eth_dev struct */
-       ether_addr_copy((struct rte_ether_addr *)hw->mac_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)hw->mac_addr,
                        &eth_dev->data->mac_addrs[0]);
 
        if (!(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR))
index b797593..da95abe 100644 (file)
@@ -535,7 +535,7 @@ eth_dev_null_create(struct rte_vdev_device *dev,
        internals->packet_size = packet_size;
        internals->packet_copy = packet_copy;
        internals->port_id = eth_dev->data->port_id;
-       eth_random_addr(internals->eth_addr.addr_bytes);
+       rte_eth_random_addr(internals->eth_addr.addr_bytes);
 
        internals->flow_type_rss_offloads =  ETH_RSS_PROTO_MASK;
        internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_RETA_GROUP_SIZE;
index 57b02ce..89760e9 100644 (file)
@@ -579,7 +579,7 @@ qede_ucast_filter(struct rte_eth_dev *eth_dev, struct ecore_filter_ucast *ucast,
                        DP_ERR(edev, "Did not allocate memory for ucast\n");
                        return -ENOMEM;
                }
-               ether_addr_copy(mac_addr, &u->mac);
+               rte_ether_addr_copy(mac_addr, &u->mac);
                u->vlan = ucast->vlan;
                u->vni = ucast->vni;
                SLIST_INSERT_HEAD(&qdev->uc_list_head, u, list);
@@ -621,14 +621,14 @@ qede_add_mcast_filters(struct rte_eth_dev *eth_dev, struct rte_ether_addr *mc_ad
                        DP_ERR(edev, "Did not allocate memory for mcast\n");
                        return -ENOMEM;
                }
-               ether_addr_copy(&mc_addrs[i], &m->mac);
+               rte_ether_addr_copy(&mc_addrs[i], &m->mac);
                SLIST_INSERT_HEAD(&qdev->mc_list_head, m, list);
        }
        memset(&mcast, 0, sizeof(mcast));
        mcast.num_mc_addrs = mc_addrs_num;
        mcast.opcode = ECORE_FILTER_ADD;
        for (i = 0; i < mc_addrs_num; i++)
-               ether_addr_copy(&mc_addrs[i], (struct rte_ether_addr *)
+               rte_ether_addr_copy(&mc_addrs[i], (struct rte_ether_addr *)
                                                        &mcast.mac[i]);
        rc = ecore_filter_mcast_cmd(edev, &mcast, ECORE_SPQ_MODE_CB, NULL);
        if (rc != ECORE_SUCCESS) {
@@ -653,7 +653,7 @@ static int qede_del_mcast_filters(struct rte_eth_dev *eth_dev)
        mcast.opcode = ECORE_FILTER_REMOVE;
        j = 0;
        SLIST_FOREACH(tmp, &qdev->mc_list_head, list) {
-               ether_addr_copy(&tmp->mac, (struct rte_ether_addr *)&mcast.mac[j]);
+               rte_ether_addr_copy(&tmp->mac, (struct rte_ether_addr *)&mcast.mac[j]);
                j++;
        }
        rc = ecore_filter_mcast_cmd(edev, &mcast, ECORE_SPQ_MODE_CB, NULL);
@@ -706,13 +706,13 @@ qede_mac_addr_add(struct rte_eth_dev *eth_dev, struct rte_ether_addr *mac_addr,
        struct ecore_filter_ucast ucast;
        int re;
 
-       if (!is_valid_assigned_ether_addr(mac_addr))
+       if (!rte_is_valid_assigned_ether_addr(mac_addr))
                return -EINVAL;
 
        qede_set_ucast_cmn_params(&ucast);
        ucast.opcode = ECORE_FILTER_ADD;
        ucast.type = ECORE_FILTER_MAC;
-       ether_addr_copy(mac_addr, (struct rte_ether_addr *)&ucast.mac);
+       rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)&ucast.mac);
        re = (int)qede_mac_int_ops(eth_dev, &ucast, 1);
        return re;
 }
@@ -732,7 +732,7 @@ qede_mac_addr_remove(struct rte_eth_dev *eth_dev, uint32_t index)
                return;
        }
 
-       if (!is_valid_assigned_ether_addr(&eth_dev->data->mac_addrs[index]))
+       if (!rte_is_valid_assigned_ether_addr(&eth_dev->data->mac_addrs[index]))
                return;
 
        qede_set_ucast_cmn_params(&ucast);
@@ -740,7 +740,7 @@ qede_mac_addr_remove(struct rte_eth_dev *eth_dev, uint32_t index)
        ucast.type = ECORE_FILTER_MAC;
 
        /* Use the index maintained by rte */
-       ether_addr_copy(&eth_dev->data->mac_addrs[index],
+       rte_ether_addr_copy(&eth_dev->data->mac_addrs[index],
                        (struct rte_ether_addr *)&ucast.mac);
 
        qede_mac_int_ops(eth_dev, &ucast, false);
@@ -1773,7 +1773,7 @@ qede_set_mc_addr_list(struct rte_eth_dev *eth_dev, struct rte_ether_addr *mc_add
        }
 
        for (i = 0; i < mc_addrs_num; i++) {
-               if (!is_multicast_ether_addr(&mc_addrs[i])) {
+               if (!rte_is_multicast_ether_addr(&mc_addrs[i])) {
                        DP_ERR(edev, "Not a valid multicast MAC\n");
                        return -EINVAL;
                }
@@ -2551,10 +2551,10 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
        }
 
        if (!is_vf) {
-               ether_addr_copy((struct rte_ether_addr *)edev->hwfns[0].
+               rte_ether_addr_copy((struct rte_ether_addr *)edev->hwfns[0].
                                hw_info.hw_mac_addr,
                                &eth_dev->data->mac_addrs[0]);
-               ether_addr_copy(&eth_dev->data->mac_addrs[0],
+               rte_ether_addr_copy(&eth_dev->data->mac_addrs[0],
                                &adapter->primary_mac);
        } else {
                ecore_vf_read_bulletin(ECORE_LEADING_HWFN(edev),
@@ -2567,9 +2567,9 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
                                                &is_mac_forced);
                        if (is_mac_exist) {
                                DP_INFO(edev, "VF macaddr received from PF\n");
-                               ether_addr_copy((struct rte_ether_addr *)&vf_mac,
+                               rte_ether_addr_copy((struct rte_ether_addr *)&vf_mac,
                                                &eth_dev->data->mac_addrs[0]);
-                               ether_addr_copy(&eth_dev->data->mac_addrs[0],
+                               rte_ether_addr_copy(&eth_dev->data->mac_addrs[0],
                                                &adapter->primary_mac);
                        } else {
                                DP_ERR(edev, "No VF macaddr assigned\n");
index 761958d..fd7966e 100644 (file)
@@ -915,7 +915,7 @@ sfc_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
         * Copy the address to the device private data so that
         * it could be recalled in the case of adapter restart.
         */
-       ether_addr_copy(mac_addr, &port->default_mac_addr);
+       rte_ether_addr_copy(mac_addr, &port->default_mac_addr);
 
        /*
         * Neither of the two following checks can return
@@ -975,7 +975,7 @@ sfc_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 
 unlock:
        if (rc != 0)
-               ether_addr_copy(old_addr, &port->default_mac_addr);
+               rte_ether_addr_copy(old_addr, &port->default_mac_addr);
 
        sfc_adapter_unlock(sa);
 
@@ -1987,7 +1987,7 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)
         * Linux kernel. Copy from NIC config to Ethernet device data.
         */
        from = (const struct rte_ether_addr *)(encp->enc_mac_addr);
-       ether_addr_copy(from, &dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(from, &dev->data->mac_addrs[0]);
 
        sfc_adapter_unlock(sa);
 
index 371648b..3ce30ac 100644 (file)
@@ -278,7 +278,7 @@ sfc_flow_parse_eth(const struct rte_flow_item *item,
        if (spec == NULL)
                return 0;
 
-       if (is_same_ether_addr(&mask->dst, &supp_mask.dst)) {
+       if (rte_is_same_ether_addr(&mask->dst, &supp_mask.dst)) {
                efx_spec->efs_match_flags |= is_ifrm ?
                        EFX_FILTER_MATCH_IFRM_LOC_MAC :
                        EFX_FILTER_MATCH_LOC_MAC;
@@ -286,7 +286,7 @@ sfc_flow_parse_eth(const struct rte_flow_item *item,
                           EFX_MAC_ADDR_LEN);
        } else if (memcmp(mask->dst.addr_bytes, ig_mask,
                          EFX_MAC_ADDR_LEN) == 0) {
-               if (is_unicast_ether_addr(&spec->dst))
+               if (rte_is_unicast_ether_addr(&spec->dst))
                        efx_spec->efs_match_flags |= is_ifrm ?
                                EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST :
                                EFX_FILTER_MATCH_UNKNOWN_UCAST_DST;
@@ -294,7 +294,7 @@ sfc_flow_parse_eth(const struct rte_flow_item *item,
                        efx_spec->efs_match_flags |= is_ifrm ?
                                EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST :
                                EFX_FILTER_MATCH_UNKNOWN_MCAST_DST;
-       } else if (!is_zero_ether_addr(&mask->dst)) {
+       } else if (!rte_is_zero_ether_addr(&mask->dst)) {
                goto fail_bad_mask;
        }
 
@@ -303,11 +303,11 @@ sfc_flow_parse_eth(const struct rte_flow_item *item,
         * ethertype masks are equal to zero in inner frame,
         * so these fields are filled in only for the outer frame
         */
-       if (is_same_ether_addr(&mask->src, &supp_mask.src)) {
+       if (rte_is_same_ether_addr(&mask->src, &supp_mask.src)) {
                efx_spec->efs_match_flags |= EFX_FILTER_MATCH_REM_MAC;
                rte_memcpy(efx_spec->efs_rem_mac, spec->src.addr_bytes,
                           EFX_MAC_ADDR_LEN);
-       } else if (!is_zero_ether_addr(&mask->src)) {
+       } else if (!rte_is_zero_ether_addr(&mask->src)) {
                goto fail_bad_mask;
        }
 
index c6f403d..c0bd49e 100644 (file)
@@ -388,7 +388,7 @@ sfc_port_attach(struct sfc_adapter *sa)
 
        RTE_BUILD_BUG_ON(sizeof(encp->enc_mac_addr) != sizeof(*from));
        from = (const struct rte_ether_addr *)(encp->enc_mac_addr);
-       ether_addr_copy(from, &port->default_mac_addr);
+       rte_ether_addr_copy(from, &port->default_mac_addr);
 
        port->max_mcast_addrs = EFX_MAC_MULTICAST_LIST_MAX;
        port->nb_mcast_addrs = 0;
index 4857fb5..fd12f02 100644 (file)
@@ -1522,7 +1522,7 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi)
                return -ENOMEM;
        }
 
-       ether_addr_copy(&eth_addr, data->mac_addrs);
+       rte_ether_addr_copy(&eth_addr, data->mac_addrs);
 
        PMD_INIT_LOG(INFO, "%s device %s successfully initialized",
                        RTE_STR(RTE_SZEDATA2_DRIVER_NAME), data->name);
index 473dcdb..6ae8809 100644 (file)
@@ -1113,7 +1113,7 @@ tap_mac_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
                return -ENOTSUP;
        }
 
-       if (is_zero_ether_addr(mac_addr)) {
+       if (rte_is_zero_ether_addr(mac_addr)) {
                TAP_LOG(ERR, "%s: can't set an empty MAC address",
                        dev->device->name);
                return -EINVAL;
@@ -1122,14 +1122,14 @@ tap_mac_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
        ret = tap_ioctl(pmd, SIOCGIFHWADDR, &ifr, 0, LOCAL_ONLY);
        if (ret < 0)
                return ret;
-       if (is_same_ether_addr((struct rte_ether_addr *)&ifr.ifr_hwaddr.sa_data,
+       if (rte_is_same_ether_addr((struct rte_ether_addr *)&ifr.ifr_hwaddr.sa_data,
                               mac_addr))
                return 0;
        /* Check the current MAC address on the remote */
        ret = tap_ioctl(pmd, SIOCGIFHWADDR, &ifr, 0, REMOTE_ONLY);
        if (ret < 0)
                return ret;
-       if (!is_same_ether_addr((struct rte_ether_addr *)&ifr.ifr_hwaddr.sa_data,
+       if (!rte_is_same_ether_addr((struct rte_ether_addr *)&ifr.ifr_hwaddr.sa_data,
                               mac_addr))
                mode = LOCAL_AND_REMOTE;
        ifr.ifr_hwaddr.sa_family = AF_LOCAL;
@@ -1674,8 +1674,8 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
        }
 
        if (pmd->type == ETH_TUNTAP_TYPE_TAP) {
-               if (is_zero_ether_addr(mac_addr))
-                       eth_random_addr((uint8_t *)&pmd->eth_addr);
+               if (rte_is_zero_ether_addr(mac_addr))
+                       rte_eth_random_addr((uint8_t *)&pmd->eth_addr);
                else
                        rte_memcpy(&pmd->eth_addr, mac_addr, sizeof(*mac_addr));
        }
index 0e01af6..0d5019c 100644 (file)
@@ -537,14 +537,14 @@ tap_flow_create_eth(const struct rte_flow_item *item, void *data)
        if (!flow)
                return 0;
        msg = &flow->msg;
-       if (!is_zero_ether_addr(&mask->dst)) {
+       if (!rte_is_zero_ether_addr(&mask->dst)) {
                tap_nlattr_add(&msg->nh, TCA_FLOWER_KEY_ETH_DST, ETHER_ADDR_LEN,
                           &spec->dst.addr_bytes);
                tap_nlattr_add(&msg->nh,
                           TCA_FLOWER_KEY_ETH_DST_MASK, ETHER_ADDR_LEN,
                           &mask->dst.addr_bytes);
        }
-       if (!is_zero_ether_addr(&mask->src)) {
+       if (!rte_is_zero_ether_addr(&mask->src)) {
                tap_nlattr_add(&msg->nh, TCA_FLOWER_KEY_ETH_SRC, ETHER_ADDR_LEN,
                           &spec->src.addr_bytes);
                tap_nlattr_add(&msg->nh,
index 2a793a4..332a249 100644 (file)
@@ -135,7 +135,7 @@ nicvf_handle_mbx_intr(struct nicvf *nic)
                nic->node = mbx.nic_cfg.node_id;
                nic->sqs_mode = mbx.nic_cfg.sqs_mode;
                nic->loopback_supported = mbx.nic_cfg.loopback_supported;
-               ether_addr_copy((struct rte_ether_addr *)mbx.nic_cfg.mac_addr,
+               rte_ether_addr_copy((struct rte_ether_addr *)mbx.nic_cfg.mac_addr,
                                (struct rte_ether_addr *)nic->mac_addr);
                nic->pf_acked = true;
                break;
index ec20879..482968b 100644 (file)
@@ -2179,10 +2179,10 @@ nicvf_eth_dev_init(struct rte_eth_dev *eth_dev)
                ret = -ENOMEM;
                goto alarm_fail;
        }
-       if (is_zero_ether_addr((struct rte_ether_addr *)nic->mac_addr))
-               eth_random_addr(&nic->mac_addr[0]);
+       if (rte_is_zero_ether_addr((struct rte_ether_addr *)nic->mac_addr))
+               rte_eth_random_addr(&nic->mac_addr[0]);
 
-       ether_addr_copy((struct rte_ether_addr *)nic->mac_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *)nic->mac_addr,
                        &eth_dev->data->mac_addrs[0]);
 
        ret = nicvf_mbox_set_mac_addr(nic, nic->mac_addr);
index 3124c1a..99a099c 100644 (file)
@@ -390,7 +390,7 @@ vdev_netvsc_device_probe(const struct if_nameindex *iface,
                strlcpy(ctx->if_name, iface->if_name, sizeof(ctx->if_name));
                return 0;
        }
-       if (!is_same_ether_addr(eth_addr, &ctx->if_addr))
+       if (!rte_is_same_ether_addr(eth_addr, &ctx->if_addr))
                return 0;
        /* Look for associated PCI device. */
        ret = vdev_netvsc_sysfs_readlink(buf, sizeof(buf), iface->if_name,
@@ -547,7 +547,7 @@ vdev_netvsc_netvsc_probe(const struct if_nameindex *iface,
                                                pair->value);
                                        return -EINVAL;
                                }
-                               if (is_same_ether_addr(eth_addr, &tmp))
+                               if (rte_is_same_ether_addr(eth_addr, &tmp))
                                        break;
                        }
                }
index 4c8d0ca..f4300a1 100644 (file)
@@ -329,8 +329,8 @@ vhost_count_multicast_broadcast(struct vhost_queue *vq,
        struct vhost_stats *pstats = &vq->stats;
 
        ea = rte_pktmbuf_mtod(mbuf, struct rte_ether_addr *);
-       if (is_multicast_ether_addr(ea)) {
-               if (is_broadcast_ether_addr(ea))
+       if (rte_is_multicast_ether_addr(ea)) {
+               if (rte_is_broadcast_ether_addr(ea))
                        pstats->xstats[VHOST_BROADCAST_PKT]++;
                else
                        pstats->xstats[VHOST_MULTICAST_PKT]++;
index 645b03c..bd405c1 100644 (file)
@@ -962,7 +962,7 @@ virtio_get_hwaddr(struct virtio_hw *hw)
                        offsetof(struct virtio_net_config, mac),
                        &hw->mac_addr, ETHER_ADDR_LEN);
        } else {
-               eth_random_addr(&hw->mac_addr[0]);
+               rte_eth_random_addr(&hw->mac_addr[0]);
                virtio_set_hwaddr(hw);
        }
 }
@@ -1018,7 +1018,7 @@ virtio_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
                const struct rte_ether_addr *addr
                        = (i == index) ? mac_addr : addrs + i;
                struct virtio_net_ctrl_mac *tbl
-                       = is_multicast_ether_addr(addr) ? mc : uc;
+                       = rte_is_multicast_ether_addr(addr) ? mc : uc;
 
                memcpy(&tbl->macs[tbl->entries++], addr, ETHER_ADDR_LEN);
        }
@@ -1047,10 +1047,10 @@ virtio_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
        for (i = 0; i < VIRTIO_MAX_MAC_ADDRS; i++) {
                struct virtio_net_ctrl_mac *tbl;
 
-               if (i == index || is_zero_ether_addr(addrs + i))
+               if (i == index || rte_is_zero_ether_addr(addrs + i))
                        continue;
 
-               tbl = is_multicast_ether_addr(addrs + i) ? mc : uc;
+               tbl = rte_is_multicast_ether_addr(addrs + i) ? mc : uc;
                memcpy(&tbl->macs[tbl->entries++], addrs + i, ETHER_ADDR_LEN);
        }
 
@@ -1483,7 +1483,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
 
        /* Copy the permanent MAC address to: virtio_hw */
        virtio_get_hwaddr(hw);
-       ether_addr_copy((struct rte_ether_addr *) hw->mac_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *) hw->mac_addr,
                        &eth_dev->data->mac_addrs[0]);
        PMD_INIT_LOG(DEBUG,
                     "PORT MAC: %02X:%02X:%02X:%02X:%02X:%02X",
index ef8936a..dc8cb48 100644 (file)
@@ -793,8 +793,8 @@ virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)
        }
 
        ea = rte_pktmbuf_mtod(mbuf, struct rte_ether_addr *);
-       if (is_multicast_ether_addr(ea)) {
-               if (is_broadcast_ether_addr(ea))
+       if (rte_is_multicast_ether_addr(ea)) {
+               if (rte_is_broadcast_ether_addr(ea))
                        stats->broadcast++;
                else
                        stats->multicast++;
index b1cbeef..96e9414 100644 (file)
@@ -311,7 +311,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
                return -ENOMEM;
        }
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct rte_ether_addr *) hw->perm_addr,
+       rte_ether_addr_copy((struct rte_ether_addr *) hw->perm_addr,
                        &eth_dev->data->mac_addrs[0]);
 
        PMD_INIT_LOG(DEBUG, "MAC Address : %02x:%02x:%02x:%02x:%02x:%02x",
@@ -1166,7 +1166,7 @@ vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
        struct vmxnet3_hw *hw = dev->data->dev_private;
 
-       ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr));
+       rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr));
        vmxnet3_write_mac(hw, mac_addr->addr_bytes);
        return 0;
 }
index fe17936..2e67aa5 100644 (file)
@@ -372,12 +372,12 @@ static int lcore_main(__attribute__((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 */
-                                               ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
+                                               rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
                                                rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
-                                               ether_addr_copy(&arp_hdr->arp_data.arp_sha, &arp_hdr->arp_data.arp_tha);
+                                               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;
                                                rte_eth_macaddr_get(BOND_PORT, &d_addr);
-                                               ether_addr_copy(&d_addr, &arp_hdr->arp_data.arp_sha);
+                                               rte_ether_addr_copy(&d_addr, &arp_hdr->arp_data.arp_sha);
                                                arp_hdr->arp_data.arp_sip = bond_ip;
                                                rte_eth_tx_burst(BOND_PORT, 0, &pkts[i], 1);
                                                is_free = 1;
@@ -392,7 +392,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                                 }
                                ipv4_hdr = (struct ipv4_hdr *)((char *)(eth_hdr + 1) + offset);
                                if (ipv4_hdr->dst_addr == bond_ip) {
-                                       ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
+                                       rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
                                        rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
                                        ipv4_hdr->dst_addr = ipv4_hdr->src_addr;
                                        ipv4_hdr->src_addr = bond_ip;
index ae61e73..35b9924 100644 (file)
@@ -163,8 +163,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 *);
-       ether_addr_copy(&ptr_mac_hdr->s_addr, &ptr_mac_hdr->d_addr);
-       ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->s_addr);
+       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);
 }
 
 static int slave_main(__attribute__((unused)) void *ptr_data)
index 35984cf..d8fa8dd 100644 (file)
@@ -327,7 +327,7 @@ rte_ethtool_net_validate_addr(uint16_t port_id __rte_unused,
 {
        if (addr == NULL)
                return -EINVAL;
-       return is_valid_assigned_ether_addr(addr);
+       return rte_is_valid_assigned_ether_addr(addr);
 }
 
 int
index ef23d96..8e30393 100644 (file)
@@ -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 *);
-       ether_addr_copy(&eth->d_addr, &addr);
-       ether_addr_copy(&addr, &eth->d_addr);
+       rte_ether_addr_copy(&eth->d_addr, &addr);
+       rte_ether_addr_copy(&addr, &eth->d_addr);
 }
 
 static __rte_always_inline void
index dad8bcc..9c77f21 100644 (file)
@@ -48,7 +48,7 @@ static inline void
 print_ether_addr(const char *what, struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", what, buf);
 }
 
index ccde72c..b223912 100644 (file)
@@ -345,7 +345,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)port_out << 40);
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[port_out], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[port_out], &eth_hdr->s_addr);
                if (ipv6)
                        eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv6);
                else
@@ -563,7 +563,7 @@ static void
 print_ethaddr(const char *name, struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
index 2261539..3a98e64 100644 (file)
@@ -409,7 +409,7 @@ reassemble(struct rte_mbuf *m, uint16_t portid, uint32_t queue,
        *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
        send_single_packet(m, dst_port);
 }
@@ -694,7 +694,7 @@ static void
 print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
index abddc6f..caad010 100644 (file)
@@ -1179,7 +1179,7 @@ static void
 print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
index 297bf11..b74971d 100644 (file)
@@ -287,8 +287,8 @@ mcast_send_pkt(struct rte_mbuf *pkt, struct rte_ether_addr *dest_addr,
        ethdr = (struct rte_ether_hdr *)rte_pktmbuf_prepend(pkt, (uint16_t)sizeof(*ethdr));
        RTE_ASSERT(ethdr != NULL);
 
-       ether_addr_copy(dest_addr, &ethdr->d_addr);
-       ether_addr_copy(&ports_eth_addr[port], &ethdr->s_addr);
+       rte_ether_addr_copy(dest_addr, &ethdr->d_addr);
+       rte_ether_addr_copy(&ports_eth_addr[port], &ethdr->s_addr);
        ethdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
 
        /* Put new packet into the output queue */
@@ -548,7 +548,7 @@ static void
 print_ethaddr(const char *name, struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
index 9ad3056..8c32615 100644 (file)
@@ -767,7 +767,7 @@ static void
 print_ethaddr(const char *name, struct rte_ether_addr *mac_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, mac_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, mac_addr);
        RTE_LOG(INFO, APP, "\t%s%s\n", name, buf);
 }
 
index 05fef7d..bde1bf3 100644 (file)
@@ -599,7 +599,7 @@ l2fwd_mac_updating(struct rte_mbuf *m, uint16_t dest_portid)
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40);
 
        /* src addr */
-       ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], &eth->s_addr);
+       rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], &eth->s_addr);
 }
 
 static void
index 033104d..77e44dc 100644 (file)
@@ -349,7 +349,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid)
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
 
        buffer = tx_buffer[dst_port];
        sent = rte_eth_tx_buffer(dst_port, 0, buffer, m);
index 21d1993..9831a43 100644 (file)
@@ -179,7 +179,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid)
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
 
        buffer = tx_buffer[dst_port];
        sent = rte_eth_tx_buffer(dst_port, 0, buffer, m);
index c1d6797..1e2b142 100644 (file)
@@ -161,7 +161,7 @@ l2fwd_mac_updating(struct rte_mbuf *m, unsigned dest_portid)
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40);
 
        /* src addr */
-       ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], &eth->s_addr);
+       rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], &eth->s_addr);
 }
 
 static void
index ed25f75..4b94c24 100644 (file)
@@ -1757,7 +1757,7 @@ static void
 print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
index c36cafb..283aa8c 100644 (file)
@@ -658,7 +658,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid,
 #endif
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
                send_single_packet(m, dst_port);
        } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
@@ -683,7 +683,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid,
                        0x000000000002 + ((uint64_t)dst_port << 40);
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
                send_single_packet(m, dst_port);
 #else
@@ -1358,7 +1358,7 @@ static void
 print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
index 2c0c89e..56a55ac 100644 (file)
@@ -450,7 +450,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid,
 #endif
 
        /* src addr */
-       ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
        send_single_packet(m, dst_port);
 
@@ -791,7 +791,7 @@ static void
 print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
index 5612ef3..4a73363 100644 (file)
@@ -47,7 +47,7 @@ l3fwd_em_simple_forward(struct rte_mbuf *m, uint16_t portid,
                *(uint64_t *)&eth_hdr->d_addr = dest_eth_addr[dst_port];
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
                send_single_packet(qconf, m, dst_port);
        } else if (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV6)) {
@@ -68,7 +68,7 @@ l3fwd_em_simple_forward(struct rte_mbuf *m, uint16_t portid,
                *(uint64_t *)&eth_hdr->d_addr = dest_eth_addr[dst_port];
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
                send_single_packet(qconf, m, dst_port);
        } else {
index 28635bf..323f853 100644 (file)
@@ -43,7 +43,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid,
                *(uint64_t *)&eth_hdr->d_addr = dest_eth_addr[dst_port];
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
                send_single_packet(qconf, m, dst_port);
        } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
@@ -64,7 +64,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid,
                *(uint64_t *)&eth_hdr->d_addr = dest_eth_addr[dst_port];
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
                send_single_packet(qconf, m, dst_port);
        } else {
index a91a0a1..ad013ba 100644 (file)
@@ -637,7 +637,7 @@ static void
 print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
@@ -895,7 +895,7 @@ main(int argc, char **argv)
                /*
                 * prepare src MACs for each port.
                 */
-               ether_addr_copy(&ports_eth_addr[portid],
+               rte_ether_addr_copy(&ports_eth_addr[portid],
                        (struct rte_ether_addr *)(val_eth + portid) + 1);
 
                /* init memory */
index 9997c58..9cd4dc7 100644 (file)
@@ -176,7 +176,7 @@ lsi_simple_forward(struct rte_mbuf *m, unsigned portid)
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&lsi_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], &eth->s_addr);
 
        buffer = tx_buffer[dst_port];
        sent = rte_eth_tx_buffer(dst_port, 0, buffer, m);
index b29ed9e..bd1ec8f 100644 (file)
@@ -1070,14 +1070,14 @@ simple_ipv4_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid)
        *(uint64_t *)&eth_hdr[7]->d_addr = dest_eth_addr[dst_port[7]];
 
        /* src addr */
-       ether_addr_copy(&ports_eth_addr[dst_port[0]], &eth_hdr[0]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[1]], &eth_hdr[1]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[2]], &eth_hdr[2]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[3]], &eth_hdr[3]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[4]], &eth_hdr[4]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[5]], &eth_hdr[5]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[6]], &eth_hdr[6]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[7]], &eth_hdr[7]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], &eth_hdr[0]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], &eth_hdr[1]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], &eth_hdr[2]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], &eth_hdr[3]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], &eth_hdr[4]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], &eth_hdr[5]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], &eth_hdr[6]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], &eth_hdr[7]->s_addr);
 
        send_single_packet(m[0], (uint8_t)dst_port[0]);
        send_single_packet(m[1], (uint8_t)dst_port[1]);
@@ -1204,14 +1204,14 @@ simple_ipv6_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid)
        *(uint64_t *)&eth_hdr[7]->d_addr = dest_eth_addr[dst_port[7]];
 
        /* src addr */
-       ether_addr_copy(&ports_eth_addr[dst_port[0]], &eth_hdr[0]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[1]], &eth_hdr[1]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[2]], &eth_hdr[2]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[3]], &eth_hdr[3]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[4]], &eth_hdr[4]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[5]], &eth_hdr[5]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[6]], &eth_hdr[6]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[7]], &eth_hdr[7]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], &eth_hdr[0]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], &eth_hdr[1]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], &eth_hdr[2]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], &eth_hdr[3]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], &eth_hdr[4]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], &eth_hdr[5]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], &eth_hdr[6]->s_addr);
+       rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], &eth_hdr[7]->s_addr);
 
        send_single_packet(m[0], dst_port[0]);
        send_single_packet(m[1], dst_port[1]);
@@ -1262,7 +1262,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid)
                *(uint64_t *)&eth_hdr->d_addr = dest_eth_addr[dst_port];
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
                send_single_packet(m, dst_port);
        } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
@@ -1283,7 +1283,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid)
                *(uint64_t *)&eth_hdr->d_addr = dest_eth_addr[dst_port];
 
                /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
+               rte_ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
 
                send_single_packet(m, dst_port);
        } else
@@ -3024,7 +3024,7 @@ print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
 
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }
 
@@ -3582,7 +3582,7 @@ main(int argc, char **argv)
                /*
                 * prepare src MACs for each port.
                 */
-               ether_addr_copy(&ports_eth_addr[portid],
+               rte_ether_addr_copy(&ports_eth_addr[portid],
                        (struct rte_ether_addr *)(val_eth + portid) + 1);
 
                /* init memory */
index 7d28f59..1266f52 100644 (file)
@@ -401,7 +401,7 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
                rte_eth_macaddr_get(ptp_data->portid, &eth_hdr->s_addr);
 
                /* Set multicast address 01-1B-19-00-00-00. */
-               ether_addr_copy(&eth_multicast, &eth_hdr->d_addr);
+               rte_ether_addr_copy(&eth_multicast, &eth_hdr->d_addr);
 
                eth_hdr->ether_type = htons(PTP_PROTOCOL);
                ptp_msg = (struct ptp_message *)
index 61e92a8..a61360b 100644 (file)
@@ -67,7 +67,7 @@ static void send_pause_frame(uint16_t port_id, uint16_t duration)
        pause_frame = (struct ether_fc_frame *) &hdr[1];
 
        rte_eth_macaddr_get(port_id, &mac_addr);
-       ether_addr_copy(&mac_addr, &hdr->s_addr);
+       rte_ether_addr_copy(&mac_addr, &hdr->s_addr);
 
        void *tmp = &hdr->d_addr.addr_bytes[0];
        *((uint64_t *)tmp) = 0x010000C28001ULL;
index e4af7bc..18a2215 100644 (file)
@@ -243,7 +243,7 @@ vxlan_link(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 (is_same_ether_addr(&(pkt_hdr->s_addr), &vdev->mac_address)) {
+       if (rte_is_same_ether_addr(&(pkt_hdr->s_addr), &vdev->mac_address)) {
                RTE_LOG(INFO, VHOST_DATA,
                        "(%d) WARNING: This device is using an existing"
                        " MAC address and has not been registered.\n",
@@ -261,11 +261,11 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
        memset(&tunnel_filter_conf, 0,
                sizeof(struct rte_eth_tunnel_filter_conf));
 
-       ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac);
+       rte_ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac);
        tunnel_filter_conf.filter_type = tep_filter_type[filter_idx];
 
        /* inner MAC */
-       ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac);
+       rte_ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac);
 
        tunnel_filter_conf.queue_id = vdev->rx_q;
        tunnel_filter_conf.tenant_id = tenant_id_conf[vdev->rx_q];
@@ -309,9 +309,9 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
        }
 
        vxdev.out_key = tenant_id_conf[vdev->rx_q];
-       ether_addr_copy(&vxdev.port[portid].peer_mac,
+       rte_ether_addr_copy(&vxdev.port[portid].peer_mac,
                        &app_l2_hdr[portid].d_addr);
-       ether_addr_copy(&ports_eth_addr[0],
+       rte_ether_addr_copy(&ports_eth_addr[0],
                        &app_l2_hdr[portid].s_addr);
        app_l2_hdr[portid].ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
 
@@ -349,8 +349,8 @@ vxlan_unlink(struct vhost_dev *vdev)
                memset(&tunnel_filter_conf, 0,
                        sizeof(struct rte_eth_tunnel_filter_conf));
 
-               ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac);
-               ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac);
+               rte_ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac);
+               rte_ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac);
                tunnel_filter_conf.tenant_id = tenant_id_conf[vdev->rx_q];
                tunnel_filter_conf.filter_type = tep_filter_type[filter_idx];
 
index bea6b97..568a2b2 100644 (file)
@@ -680,7 +680,7 @@ find_vhost_dev(struct rte_ether_addr *mac)
 
        TAILQ_FOREACH(vdev, &vhost_dev_list, global_vdev_entry) {
                if (vdev->ready == DEVICE_RX &&
-                   is_same_ether_addr(mac, &vdev->mac_address))
+                   rte_is_same_ether_addr(mac, &vdev->mac_address))
                        return vdev;
        }
 
@@ -928,7 +928,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(is_broadcast_ether_addr(&nh->d_addr))) {
+       if (unlikely(rte_is_broadcast_ether_addr(&nh->d_addr))) {
                struct vhost_dev *vdev2;
 
                TAILQ_FOREACH(vdev2, &vhost_dev_list, global_vdev_entry) {
index 5195a51..7281ffd 100644 (file)
@@ -417,7 +417,7 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port)
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
 }
 
 /* When we receive a HUP signal, print out our stats */
index 75cf31a..3890003 100644 (file)
@@ -504,7 +504,7 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port)
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
 }
 
 /* When we receive a HUP signal, print out our stats */
index 08e226c..c552a20 100644 (file)
@@ -1252,7 +1252,7 @@ rte_eth_dev_mac_restore(struct rte_eth_dev *dev,
                        addr = &dev->data->mac_addrs[i];
 
                        /* skip zero address */
-                       if (is_zero_ether_addr(addr))
+                       if (rte_is_zero_ether_addr(addr))
                                continue;
 
                        pool = 0;
@@ -2474,7 +2474,7 @@ rte_eth_macaddr_get(uint16_t port_id, struct rte_ether_addr *mac_addr)
 
        RTE_ETH_VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
-       ether_addr_copy(&dev->data->mac_addrs[0], mac_addr);
+       rte_ether_addr_copy(&dev->data->mac_addrs[0], mac_addr);
 }
 
 
@@ -2973,7 +2973,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr,
        dev = &rte_eth_devices[port_id];
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
 
-       if (is_zero_ether_addr(addr)) {
+       if (rte_is_zero_ether_addr(addr)) {
                RTE_ETHDEV_LOG(ERR, "Port %u: Cannot add NULL MAC address\n",
                        port_id);
                return -EINVAL;
@@ -3004,7 +3004,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr,
 
        if (ret == 0) {
                /* Update address in NIC data structure */
-               ether_addr_copy(addr, &dev->data->mac_addrs[index]);
+               rte_ether_addr_copy(addr, &dev->data->mac_addrs[index]);
 
                /* Update pool bitmap in NIC data structure */
                dev->data->mac_pool_sel[index] |= (1ULL << pool);
@@ -3036,7 +3036,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr)
        (*dev->dev_ops->mac_addr_remove)(dev, index);
 
        /* Update address in NIC data structure */
-       ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]);
+       rte_ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]);
 
        /* reset pool bitmap */
        dev->data->mac_pool_sel[index] = 0;
@@ -3052,7 +3052,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr)
 
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if (!is_valid_assigned_ether_addr(addr))
+       if (!rte_is_valid_assigned_ether_addr(addr))
                return -EINVAL;
 
        dev = &rte_eth_devices[port_id];
@@ -3063,7 +3063,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr)
                return ret;
 
        /* Update default address in NIC data structure */
-       ether_addr_copy(addr, &dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(addr, &dev->data->mac_addrs[0]);
 
        return 0;
 }
@@ -3103,7 +3103,7 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct rte_ether_addr *addr,
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
-       if (is_zero_ether_addr(addr)) {
+       if (rte_is_zero_ether_addr(addr)) {
                RTE_ETHDEV_LOG(ERR, "Port %u: Cannot add NULL MAC address\n",
                        port_id);
                return -EINVAL;
@@ -3135,10 +3135,10 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct rte_ether_addr *addr,
        if (ret == 0) {
                /* Update address in NIC data structure */
                if (on)
-                       ether_addr_copy(addr,
+                       rte_ether_addr_copy(addr,
                                        &dev->data->hash_mac_addrs[index]);
                else
-                       ether_addr_copy(&null_mac_addr,
+                       rte_ether_addr_copy(&null_mac_addr,
                                        &dev->data->hash_mac_addrs[index]);
        }
 
index 552db8f..398b5b4 100644 (file)
@@ -160,8 +160,8 @@ insert_new_flow(struct gro_tcp4_tbl *tbl,
 
        dst = &(tbl->flows[flow_idx].key);
 
-       ether_addr_copy(&(src->eth_saddr), &(dst->eth_saddr));
-       ether_addr_copy(&(src->eth_daddr), &(dst->eth_daddr));
+       rte_ether_addr_copy(&(src->eth_saddr), &(dst->eth_saddr));
+       rte_ether_addr_copy(&(src->eth_daddr), &(dst->eth_daddr));
        dst->ip_src_addr = src->ip_src_addr;
        dst->ip_dst_addr = src->ip_dst_addr;
        dst->recv_ack = src->recv_ack;
@@ -235,8 +235,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);
 
-       ether_addr_copy(&(eth_hdr->s_addr), &(key.eth_saddr));
-       ether_addr_copy(&(eth_hdr->d_addr), &(key.eth_daddr));
+       rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.eth_saddr));
+       rte_ether_addr_copy(&(eth_hdr->d_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;
index 439f9a8..4879e24 100644 (file)
@@ -182,8 +182,8 @@ uint32_t gro_tcp4_tbl_pkt_count(void *tbl);
 static inline int
 is_same_tcp4_flow(struct tcp4_flow_key k1, struct tcp4_flow_key k2)
 {
-       return (is_same_ether_addr(&k1.eth_saddr, &k2.eth_saddr) &&
-                       is_same_ether_addr(&k1.eth_daddr, &k2.eth_daddr) &&
+       return (rte_is_same_ether_addr(&k1.eth_saddr, &k2.eth_saddr) &&
+                       rte_is_same_ether_addr(&k1.eth_daddr, &k2.eth_daddr) &&
                        (k1.ip_src_addr == k2.ip_src_addr) &&
                        (k1.ip_dst_addr == k2.ip_dst_addr) &&
                        (k1.recv_ack == k2.recv_ack) &&
index 4985b01..baf3bef 100644 (file)
@@ -164,9 +164,9 @@ insert_new_flow(struct gro_vxlan_tcp4_tbl *tbl,
 
        dst = &(tbl->flows[flow_idx].key);
 
-       ether_addr_copy(&(src->inner_key.eth_saddr),
+       rte_ether_addr_copy(&(src->inner_key.eth_saddr),
                        &(dst->inner_key.eth_saddr));
-       ether_addr_copy(&(src->inner_key.eth_daddr),
+       rte_ether_addr_copy(&(src->inner_key.eth_daddr),
                        &(dst->inner_key.eth_daddr));
        dst->inner_key.ip_src_addr = src->inner_key.ip_src_addr;
        dst->inner_key.ip_dst_addr = src->inner_key.ip_dst_addr;
@@ -176,8 +176,8 @@ insert_new_flow(struct gro_vxlan_tcp4_tbl *tbl,
 
        dst->vxlan_hdr.vx_flags = src->vxlan_hdr.vx_flags;
        dst->vxlan_hdr.vx_vni = src->vxlan_hdr.vx_vni;
-       ether_addr_copy(&(src->outer_eth_saddr), &(dst->outer_eth_saddr));
-       ether_addr_copy(&(src->outer_eth_daddr), &(dst->outer_eth_daddr));
+       rte_ether_addr_copy(&(src->outer_eth_saddr), &(dst->outer_eth_saddr));
+       rte_ether_addr_copy(&(src->outer_eth_daddr), &(dst->outer_eth_daddr));
        dst->outer_ip_src_addr = src->outer_ip_src_addr;
        dst->outer_ip_dst_addr = src->outer_ip_dst_addr;
        dst->outer_src_port = src->outer_src_port;
@@ -193,8 +193,8 @@ static inline int
 is_same_vxlan_tcp4_flow(struct vxlan_tcp4_flow_key k1,
                struct vxlan_tcp4_flow_key k2)
 {
-       return (is_same_ether_addr(&k1.outer_eth_saddr, &k2.outer_eth_saddr) &&
-                       is_same_ether_addr(&k1.outer_eth_daddr,
+       return (rte_is_same_ether_addr(&k1.outer_eth_saddr, &k2.outer_eth_saddr) &&
+                       rte_is_same_ether_addr(&k1.outer_eth_daddr,
                                &k2.outer_eth_daddr) &&
                        (k1.outer_ip_src_addr == k2.outer_ip_src_addr) &&
                        (k1.outer_ip_dst_addr == k2.outer_ip_dst_addr) &&
@@ -348,8 +348,8 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt,
 
        sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq);
 
-       ether_addr_copy(&(eth_hdr->s_addr), &(key.inner_key.eth_saddr));
-       ether_addr_copy(&(eth_hdr->d_addr), &(key.inner_key.eth_daddr));
+       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));
        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;
@@ -358,8 +358,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;
-       ether_addr_copy(&(outer_eth_hdr->s_addr), &(key.outer_eth_saddr));
-       ether_addr_copy(&(outer_eth_hdr->d_addr), &(key.outer_eth_daddr));
+       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));
        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;
index 921adb4..2274dc6 100644 (file)
@@ -30,7 +30,7 @@ rte_net_make_rarp_packet(struct rte_mempool *mpool,
 
        /* Ethernet header. */
        memset(eth_hdr->d_addr.addr_bytes, 0xff, ETHER_ADDR_LEN);
-       ether_addr_copy(mac, &eth_hdr->s_addr);
+       rte_ether_addr_copy(mac, &eth_hdr->s_addr);
        eth_hdr->ether_type = htons(ETHER_TYPE_RARP);
 
        /* RARP header. */
@@ -41,8 +41,8 @@ rte_net_make_rarp_packet(struct rte_mempool *mpool,
        rarp->arp_plen = 4;
        rarp->arp_opcode  = htons(RTE_ARP_OP_REVREQUEST);
 
-       ether_addr_copy(mac, &rarp->arp_data.arp_sha);
-       ether_addr_copy(mac, &rarp->arp_data.arp_tha);
+       rte_ether_addr_copy(mac, &rarp->arp_data.arp_sha);
+       rte_ether_addr_copy(mac, &rarp->arp_data.arp_tha);
        memset(&rarp->arp_data.arp_sip, 0x00, 4);
        memset(&rarp->arp_data.arp_tip, 0x00, 4);
 
index ddb5318..cf6cbf4 100644 (file)
@@ -75,7 +75,7 @@ struct rte_ether_addr {
  *  True  (1) if the given two ethernet address are the same;
  *  False (0) otherwise.
  */
-static inline int is_same_ether_addr(const struct rte_ether_addr *ea1,
+static inline int rte_is_same_ether_addr(const struct rte_ether_addr *ea1,
                                     const struct rte_ether_addr *ea2)
 {
        int i;
@@ -95,7 +95,7 @@ static inline int is_same_ether_addr(const struct rte_ether_addr *ea1,
  *   True  (1) if the given ethernet address is filled with zeros;
  *   false (0) otherwise.
  */
-static inline int is_zero_ether_addr(const struct rte_ether_addr *ea)
+static inline int rte_is_zero_ether_addr(const struct rte_ether_addr *ea)
 {
        int i;
        for (i = 0; i < ETHER_ADDR_LEN; i++)
@@ -114,7 +114,7 @@ static inline int is_zero_ether_addr(const struct rte_ether_addr *ea)
  *   True  (1) if the given ethernet address is a unicast address;
  *   false (0) otherwise.
  */
-static inline int is_unicast_ether_addr(const struct rte_ether_addr *ea)
+static inline int rte_is_unicast_ether_addr(const struct rte_ether_addr *ea)
 {
        return (ea->addr_bytes[0] & ETHER_GROUP_ADDR) == 0;
 }
@@ -129,7 +129,7 @@ static inline int is_unicast_ether_addr(const struct rte_ether_addr *ea)
  *   True  (1) if the given ethernet address is a multicast address;
  *   false (0) otherwise.
  */
-static inline int is_multicast_ether_addr(const struct rte_ether_addr *ea)
+static inline int rte_is_multicast_ether_addr(const struct rte_ether_addr *ea)
 {
        return ea->addr_bytes[0] & ETHER_GROUP_ADDR;
 }
@@ -144,7 +144,7 @@ static inline int is_multicast_ether_addr(const struct rte_ether_addr *ea)
  *   True  (1) if the given ethernet address is a broadcast address;
  *   false (0) otherwise.
  */
-static inline int is_broadcast_ether_addr(const struct rte_ether_addr *ea)
+static inline int rte_is_broadcast_ether_addr(const struct rte_ether_addr *ea)
 {
        const unaligned_uint16_t *ea_words = (const unaligned_uint16_t *)ea;
 
@@ -162,7 +162,7 @@ static inline int is_broadcast_ether_addr(const struct rte_ether_addr *ea)
  *   True  (1) if the given ethernet address is a universally assigned address;
  *   false (0) otherwise.
  */
-static inline int is_universal_ether_addr(const struct rte_ether_addr *ea)
+static inline int rte_is_universal_ether_addr(const struct rte_ether_addr *ea)
 {
        return (ea->addr_bytes[0] & ETHER_LOCAL_ADMIN_ADDR) == 0;
 }
@@ -177,7 +177,7 @@ static inline int is_universal_ether_addr(const struct rte_ether_addr *ea)
  *   True  (1) if the given ethernet address is a locally assigned address;
  *   false (0) otherwise.
  */
-static inline int is_local_admin_ether_addr(const struct rte_ether_addr *ea)
+static inline int rte_is_local_admin_ether_addr(const struct rte_ether_addr *ea)
 {
        return (ea->addr_bytes[0] & ETHER_LOCAL_ADMIN_ADDR) != 0;
 }
@@ -193,9 +193,9 @@ static inline int is_local_admin_ether_addr(const struct rte_ether_addr *ea)
  *   True  (1) if the given ethernet address is valid;
  *   false (0) otherwise.
  */
-static inline int is_valid_assigned_ether_addr(const struct rte_ether_addr *ea)
+static inline int rte_is_valid_assigned_ether_addr(const struct rte_ether_addr *ea)
 {
-       return is_unicast_ether_addr(ea) && (!is_zero_ether_addr(ea));
+       return rte_is_unicast_ether_addr(ea) && (!rte_is_zero_ether_addr(ea));
 }
 
 /**
@@ -204,7 +204,7 @@ static inline int is_valid_assigned_ether_addr(const struct rte_ether_addr *ea)
  * @param addr
  *   A pointer to Ethernet address.
  */
-static inline void eth_random_addr(uint8_t *addr)
+static inline void rte_eth_random_addr(uint8_t *addr)
 {
        uint64_t rand = rte_rand();
        uint8_t *p = (uint8_t *)&rand;
@@ -222,7 +222,7 @@ static inline void eth_random_addr(uint8_t *addr)
  * @param ea_to
  *   A pointer to a ether_addr structure where to copy the Ethernet address.
  */
-static inline void ether_addr_copy(const struct rte_ether_addr *ea_from,
+static inline void rte_ether_addr_copy(const struct rte_ether_addr *ea_from,
                                   struct rte_ether_addr *ea_to)
 {
 #ifdef __INTEL_COMPILER
@@ -252,7 +252,7 @@ static inline void ether_addr_copy(const struct rte_ether_addr *ea_from,
  *   A pointer to a ether_addr structure.
  */
 static inline void
-ether_format_addr(char *buf, uint16_t size,
+rte_ether_format_addr(char *buf, uint16_t size,
                  const struct rte_ether_addr *eth_addr)
 {
        snprintf(buf, size, "%02X:%02X:%02X:%02X:%02X:%02X",
index 693be2c..3cd1fd5 100644 (file)
@@ -615,8 +615,8 @@ encap_ether_apply(void *data,
                ETHER_TYPE_IPv6;
 
        /* Ethernet */
-       ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr);
-       ether_addr_copy(&p->ether.ether.sa, &d->ether.s_addr);
+       rte_ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr);
+       rte_ether_addr_copy(&p->ether.ether.sa, &d->ether.s_addr);
        d->ether.ether_type = rte_htons(ethertype);
 
        return 0;
@@ -633,8 +633,8 @@ encap_vlan_apply(void *data,
                ETHER_TYPE_IPv6;
 
        /* Ethernet */
-       ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr);
-       ether_addr_copy(&p->vlan.ether.sa, &d->ether.s_addr);
+       rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr);
+       rte_ether_addr_copy(&p->vlan.ether.sa, &d->ether.s_addr);
        d->ether.ether_type = rte_htons(ETHER_TYPE_VLAN);
 
        /* VLAN */
@@ -657,8 +657,8 @@ encap_qinq_apply(void *data,
                ETHER_TYPE_IPv6;
 
        /* Ethernet */
-       ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);
-       ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr);
+       rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);
+       rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr);
        d->ether.ether_type = rte_htons(ETHER_TYPE_QINQ);
 
        /* SVLAN */
@@ -687,8 +687,8 @@ encap_mpls_apply(void *data,
        uint32_t i;
 
        /* Ethernet */
-       ether_addr_copy(&p->mpls.ether.da, &d->ether.d_addr);
-       ether_addr_copy(&p->mpls.ether.sa, &d->ether.s_addr);
+       rte_ether_addr_copy(&p->mpls.ether.da, &d->ether.d_addr);
+       rte_ether_addr_copy(&p->mpls.ether.sa, &d->ether.s_addr);
        d->ether.ether_type = rte_htons(ethertype);
 
        /* MPLS */
@@ -714,8 +714,8 @@ encap_pppoe_apply(void *data,
        struct encap_pppoe_data *d = data;
 
        /* Ethernet */
-       ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr);
-       ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr);
+       rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr);
+       rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr);
        d->ether.ether_type = rte_htons(ETHER_TYPE_PPPOE_SESSION);
 
        /* PPPoE and PPP*/
@@ -744,8 +744,8 @@ encap_vxlan_apply(void *data,
                        struct encap_vxlan_ipv4_vlan_data *d = data;
 
                        /* Ethernet */
-                       ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
-                       ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
+                       rte_ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
+                       rte_ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
                        d->ether.ether_type = rte_htons(ETHER_TYPE_VLAN);
 
                        /* VLAN */
@@ -783,8 +783,8 @@ encap_vxlan_apply(void *data,
                        struct encap_vxlan_ipv4_data *d = data;
 
                        /* Ethernet */
-                       ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
-                       ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
+                       rte_ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
+                       rte_ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
                        d->ether.ether_type = rte_htons(ETHER_TYPE_IPv4);
 
                        /* IPv4*/
@@ -818,8 +818,8 @@ encap_vxlan_apply(void *data,
                        struct encap_vxlan_ipv6_vlan_data *d = data;
 
                        /* Ethernet */
-                       ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
-                       ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
+                       rte_ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
+                       rte_ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
                        d->ether.ether_type = rte_htons(ETHER_TYPE_VLAN);
 
                        /* VLAN */
@@ -857,8 +857,8 @@ encap_vxlan_apply(void *data,
                        struct encap_vxlan_ipv6_data *d = data;
 
                        /* Ethernet */
-                       ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
-                       ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
+                       rte_ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
+                       rte_ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
                        d->ether.ether_type = rte_htons(ETHER_TYPE_IPv6);
 
                        /* IPv6*/
index 51ab0db..2ef5d15 100644 (file)
@@ -57,8 +57,8 @@ initialize_eth_header(struct rte_ether_hdr *eth_hdr, struct rte_ether_addr *src_
                struct rte_ether_addr *dst_mac, uint16_t ether_type,
                uint8_t vlan_enabled, uint16_t van_id)
 {
-       ether_addr_copy(dst_mac, &eth_hdr->d_addr);
-       ether_addr_copy(src_mac, &eth_hdr->s_addr);
+       rte_ether_addr_copy(dst_mac, &eth_hdr->d_addr);
+       rte_ether_addr_copy(src_mac, &eth_hdr->s_addr);
 
        if (vlan_enabled) {
                struct rte_vlan_hdr *vhdr = (struct rte_vlan_hdr *)((uint8_t *)eth_hdr +
@@ -83,9 +83,9 @@ initialize_arp_header(struct rte_arp_hdr *arp_hdr, struct rte_ether_addr *src_ma
        arp_hdr->arp_hlen = ETHER_ADDR_LEN;
        arp_hdr->arp_plen = sizeof(uint32_t);
        arp_hdr->arp_opcode = rte_cpu_to_be_16(opcode);
-       ether_addr_copy(src_mac, &arp_hdr->arp_data.arp_sha);
+       rte_ether_addr_copy(src_mac, &arp_hdr->arp_data.arp_sha);
        arp_hdr->arp_data.arp_sip = src_ip;
-       ether_addr_copy(dst_mac, &arp_hdr->arp_data.arp_tha);
+       rte_ether_addr_copy(dst_mac, &arp_hdr->arp_data.arp_tha);
        arp_hdr->arp_data.arp_tip = dst_ip;
 }
 
index 2527671..00ddb0e 100644 (file)
@@ -4482,7 +4482,7 @@ test_alb_change_mac_in_reply_sent(void)
                                MAX_PKT_BURST);
        }
 
-       ether_addr_copy(
+       rte_ether_addr_copy(
                        rte_eth_devices[test_params->bonded_port_id].data->mac_addrs,
                        &bond_mac);
 
@@ -4549,12 +4549,12 @@ test_alb_change_mac_in_reply_sent(void)
                        arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct rte_ether_hdr));
 
                        if (slave_idx%2 == 0) {
-                               if (!is_same_ether_addr(slave_mac1, &arp_pkt->arp_data.arp_sha)) {
+                               if (!rte_is_same_ether_addr(slave_mac1, &arp_pkt->arp_data.arp_sha)) {
                                        retval = -1;
                                        goto test_end;
                                }
                        } else {
-                               if (!is_same_ether_addr(slave_mac2, &arp_pkt->arp_data.arp_sha)) {
+                               if (!rte_is_same_ether_addr(slave_mac2, &arp_pkt->arp_data.arp_sha)) {
                                        retval = -1;
                                        goto test_end;
                                }
@@ -4595,7 +4595,7 @@ test_alb_reply_from_client(void)
                                MAX_PKT_BURST);
        }
 
-       ether_addr_copy(
+       rte_ether_addr_copy(
                        rte_eth_devices[test_params->bonded_port_id].data->mac_addrs,
                        &bond_mac);
 
@@ -4670,12 +4670,12 @@ test_alb_reply_from_client(void)
                        arp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct rte_ether_hdr));
 
                        if (slave_idx%2 == 0) {
-                               if (!is_same_ether_addr(slave_mac1, &arp_pkt->arp_data.arp_sha)) {
+                               if (!rte_is_same_ether_addr(slave_mac1, &arp_pkt->arp_data.arp_sha)) {
                                        retval = -1;
                                        goto test_end;
                                }
                        } else {
-                               if (!is_same_ether_addr(slave_mac2, &arp_pkt->arp_data.arp_sha)) {
+                               if (!rte_is_same_ether_addr(slave_mac2, &arp_pkt->arp_data.arp_sha)) {
                                        retval = -1;
                                        goto test_end;
                                }
@@ -4722,7 +4722,7 @@ test_alb_receive_vlan_reply(void)
                                MAX_PKT_BURST);
        }
 
-       ether_addr_copy(
+       rte_ether_addr_copy(
                        rte_eth_devices[test_params->bonded_port_id].data->mac_addrs,
                        &bond_mac);
 
index 63fcafa..f5ac6c9 100644 (file)
@@ -232,7 +232,7 @@ add_slave(struct slave_conf *slave, uint8_t start)
        RTE_VERIFY(slave->bonded == 0);
        RTE_VERIFY(slave->port_id != INVALID_PORT_ID);
 
-       ether_addr_copy(&slave_mac_default, &addr);
+       rte_ether_addr_copy(&slave_mac_default, &addr);
        addr.addr_bytes[ETHER_ADDR_LEN - 1] = slave->port_id;
 
        rte_eth_dev_mac_addr_remove(slave->port_id, &addr);
@@ -253,7 +253,7 @@ add_slave(struct slave_conf *slave, uint8_t start)
        }
 
        rte_eth_macaddr_get(slave->port_id, &addr_check);
-       TEST_ASSERT_EQUAL(is_same_ether_addr(&addr, &addr_check), 1,
+       TEST_ASSERT_EQUAL(rte_is_same_ether_addr(&addr, &addr_check), 1,
                        "Slave MAC address is not as expected");
 
        RTE_VERIFY(slave->lacp_parnter_state == 0);
@@ -491,7 +491,7 @@ 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 */
-       ether_addr_copy(&parnter_mac_default, &slow_hdr->eth_hdr.s_addr);
+       rte_ether_addr_copy(&parnter_mac_default, &slow_hdr->eth_hdr.s_addr);
        slow_hdr->eth_hdr.s_addr.addr_bytes[ETHER_ADDR_LEN - 1] = slave->port_id;
 
        lacp = (struct lacpdu *) &slow_hdr->slow_protocol;
@@ -503,7 +503,7 @@ make_lacp_reply(struct slave_conf *slave, struct rte_mbuf *pkt)
 
        lacp->partner.state = lacp->actor.state;
 
-       ether_addr_copy(&parnter_system, &lacp->actor.port_params.system);
+       rte_ether_addr_copy(&parnter_system, &lacp->actor.port_params.system);
        lacp->actor.state = STATE_LACP_ACTIVE |
                                                STATE_SYNCHRONIZATION |
                                                STATE_AGGREGATION |
@@ -810,7 +810,7 @@ test_mode4_rx(void)
        TEST_ASSERT_SUCCESS(retval, "Initial handshake failed");
 
        rte_eth_macaddr_get(test_params.bonded_port_id, &bonded_mac);
-       ether_addr_copy(&bonded_mac, &dst_mac);
+       rte_ether_addr_copy(&bonded_mac, &dst_mac);
 
        /* Assert that dst address is not bonding address.  Do not set the
         * least significant bit of the zero byte as this would create a
@@ -845,7 +845,7 @@ test_mode4_rx(void)
 
                for (i = 0; i < expected_pkts_cnt; i++) {
                        hdr = rte_pktmbuf_mtod(pkts[i], struct rte_ether_hdr *);
-                       cnt[is_same_ether_addr(&hdr->d_addr, &bonded_mac)]++;
+                       cnt[rte_is_same_ether_addr(&hdr->d_addr, &bonded_mac)]++;
                }
 
                free_pkts(pkts, expected_pkts_cnt);
@@ -889,7 +889,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 += is_same_ether_addr(&hdr->d_addr, &bonded_mac);
+                       eq_cnt += rte_is_same_ether_addr(&hdr->d_addr, &bonded_mac);
                }
 
                free_pkts(pkts, expected_pkts_cnt);
@@ -1130,10 +1130,10 @@ init_marker(struct rte_mbuf *pkt, struct slave_conf *slave)
                        struct marker_header *);
 
        /* Copy multicast destination address */
-       ether_addr_copy(&slow_protocol_mac_addr, &marker_hdr->eth_hdr.d_addr);
+       rte_ether_addr_copy(&slow_protocol_mac_addr, &marker_hdr->eth_hdr.d_addr);
 
        /* Init source address */
-       ether_addr_copy(&parnter_mac_default, &marker_hdr->eth_hdr.s_addr);
+       rte_ether_addr_copy(&parnter_mac_default, &marker_hdr->eth_hdr.s_addr);
        marker_hdr->eth_hdr.s_addr.addr_bytes[ETHER_ADDR_LEN-1] = slave->port_id;
 
        marker_hdr->eth_hdr.ether_type = rte_cpu_to_be_16(ETHER_TYPE_SLOW);
@@ -1358,8 +1358,8 @@ test_mode4_ext_ctrl(void)
                },
        };
 
-       ether_addr_copy(&parnter_system, &src_mac);
-       ether_addr_copy(&slow_protocol_mac_addr, &dst_mac);
+       rte_ether_addr_copy(&parnter_system, &src_mac);
+       rte_ether_addr_copy(&slow_protocol_mac_addr, &dst_mac);
 
        initialize_eth_header(&lacpdu.eth_hdr, &src_mac, &dst_mac,
                              ETHER_TYPE_SLOW, 0, 0);
@@ -1412,8 +1412,8 @@ test_mode4_ext_lacp(void)
                },
        };
 
-       ether_addr_copy(&parnter_system, &src_mac);
-       ether_addr_copy(&slow_protocol_mac_addr, &dst_mac);
+       rte_ether_addr_copy(&parnter_system, &src_mac);
+       rte_ether_addr_copy(&slow_protocol_mac_addr, &dst_mac);
 
        initialize_eth_header(&lacpdu.eth_hdr, &src_mac, &dst_mac,
                              ETHER_TYPE_SLOW, 0, 0);
index 1265cb8..3660eff 100644 (file)
@@ -174,7 +174,7 @@ static void
 print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       rte_ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }