net: add macro for MAC address print

Added macro to print six bytes of MAC address.
The MAC addresses will be printed in upper case
hexadecimal format.
In case there is a specific check for lower case
MAC address, the user may need to make a change in
such test case after this patch.

Signed-off-by: Aman Deep Singh <aman.deep.singh@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 395122b..a672909 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -10905,7 +10905,7 @@ static void cmd_mcast_addr_parsed(void *parsed_result,
 
        if (!rte_is_multicast_ether_addr(&res->mc_addr)) {
                fprintf(stderr,
-                       "Invalid multicast addr %02X:%02X:%02X:%02X:%02X:%02X\n",
+                       "Invalid multicast addr " RTE_ETHER_ADDR_PRT_FMT "\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],
                        res->mc_addr.addr_bytes[4], res->mc_addr.addr_bytes[5]);

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index bd404db..05152f4 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -782,7 +782,7 @@ port_summary_display(portid_t port_id)
        if (ret != 0)
                return;
 
-       printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %s\n",
+       printf("%-4d " RTE_ETHER_ADDR_PRT_FMT " %-12s %-14s %-8s %s\n",
                port_id, mac_addr.addr_bytes[0], mac_addr.addr_bytes[1],
                mac_addr.addr_bytes[2], mac_addr.addr_bytes[3],
                mac_addr.addr_bytes[4], mac_addr.addr_bytes[5], name,

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 5b645b7..c44e6ee 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2692,7 +2692,7 @@ start_port(portid_t pid)
                                pi);
 
                if (eth_macaddr_get_print_err(pi, &port->eth_addr) == 0)
-                       printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi,
+                       printf("Port %d: " RTE_ETHER_ADDR_PRT_FMT "\n", pi,
                                port->eth_addr.addr_bytes[0],
                                port->eth_addr.addr_bytes[1],
                                port->eth_addr.addr_bytes[2],

diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index 120deb0..556d631 100644 (file)
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -47,7 +47,7 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
                       (__if->mac_type == fman_mac_1g) ? "1G" :
                       (__if->mac_type == fman_mac_2_5g) ? "2.5G" : "10G");
 
-               printf("\tmac_addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
+               printf("\tmac_addr: " RTE_ETHER_ADDR_PRT_FMT "\n",
                       (&__if->mac_addr)->addr_bytes[0],
                       (&__if->mac_addr)->addr_bytes[1],
                       (&__if->mac_addr)->addr_bytes[2],

diff --git a/drivers/common/mlx5/linux/mlx5_nl.c b/drivers/common/mlx5/linux/mlx5_nl.c
index dc8dafd..efd9297 100644 (file)
--- a/drivers/common/mlx5/linux/mlx5_nl.c
+++ b/drivers/common/mlx5/linux/mlx5_nl.c
@@ -693,7 +693,7 @@ mlx5_nl_vf_mac_addr_modify(int nlsk_fd, unsigned int iface_idx,
 error:
        DRV_LOG(ERR,
                "representor %u cannot set VF MAC address "
-               "%02X:%02X:%02X:%02X:%02X:%02X : %s",
+               RTE_ETHER_ADDR_PRT_FMT " : %s",
                vf_index,
                mac->addr_bytes[0], mac->addr_bytes[1],
                mac->addr_bytes[2], mac->addr_bytes[3],

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 7ee805b..9163b8b 100644 (file)
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -8176,7 +8176,7 @@ static int bnx2x_get_shmem_info(struct bnx2x_softc *sc)
                sc->link_params.mac_addr[4] = (uint8_t) (mac_lo >> 8);
                sc->link_params.mac_addr[5] = (uint8_t) (mac_lo);
                snprintf(sc->mac_addr_str, sizeof(sc->mac_addr_str),
-                        "%02x:%02x:%02x:%02x:%02x:%02x",
+                        RTE_ETHER_ADDR_PRT_FMT,
                         sc->link_params.mac_addr[0],
                         sc->link_params.mac_addr[1],
                         sc->link_params.mac_addr[2],
@@ -11894,7 +11894,7 @@ void bnx2x_print_device_info(struct bnx2x_softc *sc)
        PMD_DRV_LOG(INFO, sc, "%12s : %u", "MTU", sc->mtu);
        PMD_DRV_LOG(INFO, sc,
                    "%12s : %s", "PHY Type", get_ext_phy_type(ext_phy_type));
-       PMD_DRV_LOG(INFO, sc, "%12s : %x:%x:%x:%x:%x:%x", "MAC Addr",
+       PMD_DRV_LOG(INFO, sc, "%12s : " RTE_ETHER_ADDR_PRT_FMT, "MAC Addr",
                        sc->link_params.mac_addr[0],
                        sc->link_params.mac_addr[1],
                        sc->link_params.mac_addr[2],

diff --git a/drivers/net/bnx2x/bnx2x_vfpf.c b/drivers/net/bnx2x/bnx2x_vfpf.c
index 097ccfe..03ba0d8 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/bnx2x/bnx2x_vfpf.c
@@ -728,7 +728,8 @@ bnx2x_vfpf_set_mcast(struct bnx2x_softc *sc,
        }
 
        for (i = 0; i < mc_addrs_num; i++) {
-               PMD_DRV_LOG(DEBUG, sc, "Adding mcast MAC:%x:%x:%x:%x:%x:%x",
+               PMD_DRV_LOG(DEBUG, sc, "Adding mcast MAC:"
+                               RTE_ETHER_ADDR_PRT_FMT,
                                mc_addrs[i].addr_bytes[0],
                                mc_addrs[i].addr_bytes[1],
                                mc_addrs[i].addr_bytes[2],

diff --git a/drivers/net/bnx2x/ecore_sp.c b/drivers/net/bnx2x/ecore_sp.c
index 61f99c6..0075422 100644 (file)
--- a/drivers/net/bnx2x/ecore_sp.c
+++ b/drivers/net/bnx2x/ecore_sp.c
@@ -618,7 +618,7 @@ static int ecore_check_mac_add(struct bnx2x_softc *sc __rte_unused,
 {
        struct ecore_vlan_mac_registry_elem *pos;
 
-       ECORE_MSG(sc, "Checking MAC %02x:%02x:%02x:%02x:%02x:%02x for ADD command",
+       ECORE_MSG(sc, "Checking MAC " RTE_ETHER_ADDR_PRT_FMT " for ADD command",
                  data->mac.mac[0], data->mac.mac[1], data->mac.mac[2],
                  data->mac.mac[3], data->mac.mac[4], data->mac.mac[5]);
 
@@ -647,7 +647,7 @@ static struct ecore_vlan_mac_registry_elem *ecore_check_mac_del(struct bnx2x_sof
 {
        struct ecore_vlan_mac_registry_elem *pos;
 
-       ECORE_MSG(sc, "Checking MAC %02x:%02x:%02x:%02x:%02x:%02x for DEL command",
+       ECORE_MSG(sc, "Checking MAC " RTE_ETHER_ADDR_PRT_FMT " for DEL command",
                  data->mac.mac[0], data->mac.mac[1], data->mac.mac[2],
                  data->mac.mac[3], data->mac.mac[4], data->mac.mac[5]);
 
@@ -841,7 +841,7 @@ static void ecore_set_one_mac_e2(struct bnx2x_softc *sc,
        ecore_vlan_mac_set_cmd_hdr_e2(o, add, CLASSIFY_RULE_OPCODE_MAC,
                                      &rule_entry->mac.header);
 
-       ECORE_MSG(sc, "About to %s MAC %02x:%02x:%02x:%02x:%02x:%02x for Queue %d",
+       ECORE_MSG(sc, "About to %s MAC " RTE_ETHER_ADDR_PRT_FMT " for Queue %d",
                  (add ? "add" : "delete"), mac[0], mac[1], mac[2], mac[3],
                  mac[4], mac[5], raw->cl_id);
 
@@ -946,7 +946,7 @@ static void ecore_vlan_mac_set_rdata_e1x(struct bnx2x_softc *sc
        ecore_vlan_mac_set_cfg_entry_e1x(o, add, opcode, mac, vlan_id,
                                         cfg_entry);
 
-       ECORE_MSG(sc, "%s MAC %02x:%02x:%02x:%02x:%02x:%02x CLID %d CAM offset %d",
+       ECORE_MSG(sc, "%s  MAC " RTE_ETHER_ADDR_PRT_FMT " CLID %d CAM offset %d",
                  (add ? "setting" : "clearing"),
                  mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
                  o->raw.cl_id, cam_offset);
@@ -2511,7 +2511,7 @@ static void ecore_mcast_hdl_pending_add_e2(struct bnx2x_softc *sc,
                cnt++;
 
                    ECORE_MSG
-                   (sc, "About to configure %02x:%02x:%02x:%02x:%02x:%02x mcast MAC",
+                   (sc, "About to configure " RTE_ETHER_ADDR_PRT_FMT " mcast MAC",
                     pmac_pos->mac[0], pmac_pos->mac[1], pmac_pos->mac[2],
                     pmac_pos->mac[3], pmac_pos->mac[4], pmac_pos->mac[5]);
 
@@ -2644,7 +2644,7 @@ static void ecore_mcast_hdl_add(struct bnx2x_softc *sc,
                cnt++;
 
                    ECORE_MSG
-                   (sc, "About to configure %02x:%02x:%02x:%02x:%02x:%02x mcast MAC",
+                   (sc, "About to configure " RTE_ETHER_ADDR_PRT_FMT " mcast MAC",
                     mlist_pos->mac[0], mlist_pos->mac[1], mlist_pos->mac[2],
                     mlist_pos->mac[3], mlist_pos->mac[4], mlist_pos->mac[5]);
        }
@@ -2944,7 +2944,7 @@ static void ecore_mcast_hdl_add_e1h(struct bnx2x_softc *sc __rte_unused,
                ECORE_57711_SET_MC_FILTER(mc_filter, bit);
 
                    ECORE_MSG
-                   (sc, "About to configure %02x:%02x:%02x:%02x:%02x:%02x mcast MAC, bin %d",
+                   (sc, "About to configure " RTE_ETHER_ADDR_PRT_FMT " mcast MAC, bin %d",
                     mlist_pos->mac[0], mlist_pos->mac[1], mlist_pos->mac[2],
                     mlist_pos->mac[3], mlist_pos->mac[4], mlist_pos->mac[5],
                     bit);

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index e072771..d6e3847 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4996,7 +4996,7 @@ static int bnxt_setup_mac_addr(struct rte_eth_dev *eth_dev)
                PMD_DRV_LOG(INFO, "VF MAC address not assigned by Host PF\n");
                bnxt_eth_hw_addr_random(bp->mac_addr);
                PMD_DRV_LOG(INFO,
-                           "Assign random MAC:%02X:%02X:%02X:%02X:%02X:%02X\n",
+                           "Assign random MAC:" RTE_ETHER_ADDR_PRT_FMT "\n",
                            bp->mac_addr[0], bp->mac_addr[1], bp->mac_addr[2],
                            bp->mac_addr[3], bp->mac_addr[4], bp->mac_addr[5]);
 

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index 128754f..8b5b32f 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -55,11 +55,11 @@ bond_print_lacp(struct lacpdu *l)
        uint8_t *addr;
 
        addr = l->actor.port_params.system.addr_bytes;
-       snprintf(a_address, sizeof(a_address), "%02X:%02X:%02X:%02X:%02X:%02X",
+       snprintf(a_address, sizeof(a_address), RTE_ETHER_ADDR_PRT_FMT,
                addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
 
        addr = l->partner.port_params.system.addr_bytes;
-       snprintf(p_address, sizeof(p_address), "%02X:%02X:%02X:%02X:%02X:%02X",
+       snprintf(p_address, sizeof(p_address), RTE_ETHER_ADDR_PRT_FMT,
                addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
 
        for (i = 0; i < 8; i++) {

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index a675566..d3cbd75 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -473,8 +473,8 @@ update_client_stats(uint32_t addr, uint16_t port, uint32_t *TXorRXindicator)
 #ifdef RTE_LIBRTE_BOND_DEBUG_ALB
 #define MODE6_DEBUG(info, src_ip, dst_ip, eth_h, arp_op, port, burstnumber) \
        rte_log(RTE_LOG_DEBUG, bond_logtype,                            \
-               "%s port:%d SrcMAC:%02X:%02X:%02X:%02X:%02X:%02X SrcIP:%s " \
-               "DstMAC:%02X:%02X:%02X:%02X:%02X:%02X DstIP:%s %s %d\n", \
+               "%s port:%d SrcMAC:" RTE_ETHER_ADDR_PRT_FMT " SrcIP:%s " \
+               "DstMAC:" RTE_ETHER_ADDR_PRT_FMT " DstIP:%s %s %d\n", \
                info,                                                   \
                port,                                                   \
                eth_h->s_addr.addr_bytes[0], eth_h->s_addr.addr_bytes[1], \

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 27d670f..c5739a3 100644 (file)
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -2094,7 +2094,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        /* copy the primary mac address */
        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",
+       RTE_LOG(INFO, PMD, "net: dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT "\n",
                dpaa_device->name,
                fman_intf->mac_addr.addr_bytes[0],
                fman_intf->mac_addr.addr_bytes[1],

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 10ee0f3..91db303 100644 (file)
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -977,7 +977,7 @@ eth_igbvf_dev_init(struct rte_eth_dev *eth_dev)
                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",
+                            RTE_ETHER_ADDR_PRT_FMT,
                             perm_addr->addr_bytes[0],
                             perm_addr->addr_bytes[1],
                             perm_addr->addr_bytes[2],

diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c
index 55c08eb..ab6e057 100644 (file)
--- a/drivers/net/enic/base/vnic_dev.c
+++ b/drivers/net/enic/base/vnic_dev.c
@@ -889,7 +889,7 @@ int vnic_dev_add_addr(struct vnic_dev *vdev, uint8_t *addr)
 
        err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
        if (err)
-               pr_err("Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
+               pr_err("Can't add addr [" RTE_ETHER_ADDR_PRT_FMT "], %d\n",
                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
                        err);
 
@@ -908,7 +908,7 @@ int vnic_dev_del_addr(struct vnic_dev *vdev, uint8_t *addr)
 
        err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
        if (err)
-               pr_err("Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
+               pr_err("Can't del addr [" RTE_ETHER_ADDR_PRT_FMT "], %d\n",
                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
                        err);
 

diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index a8f5332..0493e09 100644 (file)
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -113,7 +113,7 @@ int enic_get_vnic_config(struct enic *enic)
                                  vnic_dev_get_intr_coal_timer_max(enic->vdev));
 
        dev_info(enic_get_dev(enic),
-               "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x "
+               "vNIC MAC addr " RTE_ETHER_ADDR_PRT_FMT
                "wq/rq %d/%d mtu %d, max mtu:%d\n",
                enic->mac_addr[0], enic->mac_addr[1], enic->mac_addr[2],
                enic->mac_addr[3], enic->mac_addr[4], enic->mac_addr[5],

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 8216063..919d287 100644 (file)
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -260,7 +260,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                if (i == priv->subs_tail)
                        rte_eth_random_addr(&mac->addr_bytes[0]);
        }
-       INFO("MAC address is %02x:%02x:%02x:%02x:%02x:%02x",
+       INFO("MAC address is " RTE_ETHER_ADDR_PRT_FMT,
                mac->addr_bytes[0], mac->addr_bytes[1],
                mac->addr_bytes[2], mac->addr_bytes[3],
                mac->addr_bytes[4], mac->addr_bytes[5]);

diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index 1a72401..3ffad21 100644 (file)
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -2359,7 +2359,7 @@ static int hinic_set_mac_addr(struct rte_eth_dev *dev,
 
        rte_ether_addr_copy(addr, &nic_dev->default_addr);
 
-       PMD_DRV_LOG(INFO, "Set new mac address %02x:%02x:%02x:%02x:%02x:%02x",
+       PMD_DRV_LOG(INFO, "Set new mac address " RTE_ETHER_ADDR_PRT_FMT,
                    addr->addr_bytes[0], addr->addr_bytes[1],
                    addr->addr_bytes[2], addr->addr_bytes[3],
                    addr->addr_bytes[4], addr->addr_bytes[5]);

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 0cfe13b..dcc2b64 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -867,7 +867,7 @@ i40evf_add_mac_addr(struct rte_eth_dev *dev,
        int err;
 
        if (rte_is_zero_ether_addr(addr)) {
-               PMD_DRV_LOG(ERR, "Invalid mac:%x:%x:%x:%x:%x:%x",
+               PMD_DRV_LOG(ERR, "Invalid mac:" RTE_ETHER_ADDR_PRT_FMT,
                            addr->addr_bytes[0], addr->addr_bytes[1],
                            addr->addr_bytes[2], addr->addr_bytes[3],
                            addr->addr_bytes[4], addr->addr_bytes[5]);
@@ -2130,7 +2130,7 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)
                        list->list[j].type = (j == 0 ?
                                              VIRTCHNL_ETHER_ADDR_PRIMARY :
                                              VIRTCHNL_ETHER_ADDR_EXTRA);
-                       PMD_DRV_LOG(DEBUG, "add/rm mac:%x:%x:%x:%x:%x:%x",
+                       PMD_DRV_LOG(DEBUG, "add/rm mac:" RTE_ETHER_ADDR_PRT_FMT,
                                    addr->addr_bytes[0], addr->addr_bytes[1],
                                    addr->addr_bytes[2], addr->addr_bytes[3],
                                    addr->addr_bytes[4], addr->addr_bytes[5]);
@@ -2949,7 +2949,7 @@ i40evf_add_del_mc_addr_list(struct rte_eth_dev *dev,
 
        for (i = 0; i < mc_addrs_num; i++) {
                if (!I40E_IS_MULTICAST(mc_addrs[i].addr_bytes)) {
-                       PMD_DRV_LOG(ERR, "Invalid mac:%x:%x:%x:%x:%x:%x",
+                       PMD_DRV_LOG(ERR, "Invalid mac:" RTE_ETHER_ADDR_PRT_FMT,
                                    mc_addrs[i].addr_bytes[0],
                                    mc_addrs[i].addr_bytes[1],
                                    mc_addrs[i].addr_bytes[2],

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index dc5cbc2..d054e41 100644 (file)
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1486,7 +1486,7 @@ iavf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
        ret = iavf_add_del_eth_addr(adapter, old_addr, false, VIRTCHNL_ETHER_ADDR_PRIMARY);
        if (ret)
                PMD_DRV_LOG(ERR, "Fail to delete old MAC:"
-                           " %02X:%02X:%02X:%02X:%02X:%02X",
+                           RTE_ETHER_ADDR_PRT_FMT,
                            old_addr->addr_bytes[0],
                            old_addr->addr_bytes[1],
                            old_addr->addr_bytes[2],
@@ -1497,7 +1497,7 @@ iavf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
        ret = iavf_add_del_eth_addr(adapter, mac_addr, true, VIRTCHNL_ETHER_ADDR_PRIMARY);
        if (ret)
                PMD_DRV_LOG(ERR, "Fail to add new MAC:"
-                           " %02X:%02X:%02X:%02X:%02X:%02X",
+                           RTE_ETHER_ADDR_PRT_FMT,
                            mac_addr->addr_bytes[0],
                            mac_addr->addr_bytes[1],
                            mac_addr->addr_bytes[2],

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 06dc663..62fb91e 100644 (file)
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -1176,7 +1176,7 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
                        list->list[j].type = (j == 0 ?
                                              VIRTCHNL_ETHER_ADDR_PRIMARY :
                                              VIRTCHNL_ETHER_ADDR_EXTRA);
-                       PMD_DRV_LOG(DEBUG, "add/rm mac:%x:%x:%x:%x:%x:%x",
+                       PMD_DRV_LOG(DEBUG, "add/rm mac:" RTE_ETHER_ADDR_PRT_FMT,
                                    addr->addr_bytes[0], addr->addr_bytes[1],
                                    addr->addr_bytes[2], addr->addr_bytes[3],
                                    addr->addr_bytes[4], addr->addr_bytes[5]);
@@ -1626,7 +1626,7 @@ iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,
 
        for (i = 0; i < mc_addrs_num; i++) {
                if (!IAVF_IS_MULTICAST(mc_addrs[i].addr_bytes)) {
-                       PMD_DRV_LOG(ERR, "Invalid mac:%x:%x:%x:%x:%x:%x",
+                       PMD_DRV_LOG(ERR, "Invalid mac:" RTE_ETHER_ADDR_PRT_FMT,
                                    mc_addrs[i].addr_bytes[0],
                                    mc_addrs[i].addr_bytes[1],
                                    mc_addrs[i].addr_bytes[2],

diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c
index ee3c85b..19a7154 100644 (file)
--- a/drivers/net/ice/ice_dcf.c
+++ b/drivers/net/ice/ice_dcf.c
@@ -1075,7 +1075,7 @@ ice_dcf_add_del_all_mac_addr(struct ice_dcf_hw *hw, bool add)
 
        rte_memcpy(list->list[0].addr, addr->addr_bytes,
                        sizeof(addr->addr_bytes));
-       PMD_DRV_LOG(DEBUG, "add/rm mac:%x:%x:%x:%x:%x:%x",
+       PMD_DRV_LOG(DEBUG, "add/rm mac:" RTE_ETHER_ADDR_PRT_FMT,
                            addr->addr_bytes[0], addr->addr_bytes[1],
                            addr->addr_bytes[2], addr->addr_bytes[3],
                            addr->addr_bytes[4], addr->addr_bytes[5]);

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index ccb01ed..851d5f9 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1650,7 +1650,7 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
                }
                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",
+                            RTE_ETHER_ADDR_PRT_FMT,
                             perm_addr->addr_bytes[0],
                             perm_addr->addr_bytes[1],
                             perm_addr->addr_bytes[2],
@@ -6302,7 +6302,7 @@ ixgbevf_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
        diag = ixgbevf_set_uc_addr_vf(hw, 2, mac_addr->addr_bytes);
        if (diag != 0)
                PMD_DRV_LOG(ERR, "Unable to add MAC address "
-                           "%02x:%02x:%02x:%02x:%02x:%02x - diag=%d",
+                           RTE_ETHER_ADDR_PRT_FMT " - diag=%d",
                            mac_addr->addr_bytes[0],
                            mac_addr->addr_bytes[1],
                            mac_addr->addr_bytes[2],
@@ -6351,7 +6351,7 @@ ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index)
                if (diag != 0)
                        PMD_DRV_LOG(ERR,
                                    "Adding again MAC address "
-                                   "%02x:%02x:%02x:%02x:%02x:%02x failed "
+                                    RTE_ETHER_ADDR_PRT_FMT " failed "
                                    "diag=%d",
                                    mac_addr->addr_bytes[0],
                                    mac_addr->addr_bytes[1],

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index c522157..2b17bfa 100644 (file)
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -1014,7 +1014,7 @@ err_secondary:
                              " (error: %s)", strerror(err));
                        goto port_error;
                }
-               INFO("port %u MAC address is %02x:%02x:%02x:%02x:%02x:%02x",
+               INFO("port %u MAC address is " RTE_ETHER_ADDR_PRT_FMT,
                     priv->port,
                     mac.addr_bytes[0], mac.addr_bytes[1],
                     mac.addr_bytes[2], mac.addr_bytes[3],

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 5f8766a..8949900 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1702,7 +1702,7 @@ err_secondary:
                goto error;
        }
        DRV_LOG(INFO,
-               "port %u MAC address is %02x:%02x:%02x:%02x:%02x:%02x",
+               "port %u MAC address is " RTE_ETHER_ADDR_PRT_FMT,
                eth_dev->data->port_id,
                mac.addr_bytes[0], mac.addr_bytes[1],
                mac.addr_bytes[2], mac.addr_bytes[3],

diff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c
index 7e1df1c..c2e4665 100644 (file)
--- a/drivers/net/mlx5/windows/mlx5_os.c
+++ b/drivers/net/mlx5/windows/mlx5_os.c
@@ -566,7 +566,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                goto error;
        }
        DRV_LOG(INFO,
-               "port %u MAC address is %02x:%02x:%02x:%02x:%02x:%02x",
+               "port %u MAC address is " RTE_ETHER_ADDR_PRT_FMT,
                eth_dev->data->port_id,
                mac.addr_bytes[0], mac.addr_bytes[1],
                mac.addr_bytes[2], mac.addr_bytes[3],

diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c
index 3c8052f..99695b9 100644 (file)
--- a/drivers/net/mvpp2/mrvl_flow.c
+++ b/drivers/net/mvpp2/mrvl_flow.c
@@ -207,11 +207,11 @@ mrvl_parse_mac(const struct rte_flow_item_eth *spec,
        key_field->size = 6;
 
        snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX,
-                "%02x:%02x:%02x:%02x:%02x:%02x",
+                RTE_ETHER_ADDR_PRT_FMT,
                 k[0], k[1], k[2], k[3], k[4], k[5]);
 
        snprintf((char *)key_field->mask, MRVL_CLS_STR_SIZE_MAX,
-                "%02x:%02x:%02x:%02x:%02x:%02x",
+                RTE_ETHER_ADDR_PRT_FMT,
                 m[0], m[1], m[2], m[3], m[4], m[5]);
 
        flow->table_key.proto_field[flow->rule.num_fields].proto =

diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c
index e3f7e63..62ba396 100644 (file)
--- a/drivers/net/netvsc/hn_rndis.c
+++ b/drivers/net/netvsc/hn_rndis.c
@@ -1104,7 +1104,7 @@ hn_rndis_get_eaddr(struct hn_data *hv, uint8_t *eaddr)
        if (error)
                return error;
 
-       PMD_DRV_LOG(INFO, "MAC address %02x:%02x:%02x:%02x:%02x:%02x",
+       PMD_DRV_LOG(INFO, "MAC address " RTE_ETHER_ADDR_PRT_FMT,
                    eaddr[0], eaddr[1], eaddr[2],
                    eaddr[3], eaddr[4], eaddr[5]);
        return 0;

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 534a38c..6ba3c27 100644 (file)
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -566,7 +566,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
        eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
 
        PMD_INIT_LOG(INFO, "port %d VendorID=0x%x DeviceID=0x%x "
-                    "mac=%02x:%02x:%02x:%02x:%02x:%02x",
+                    "mac=" RTE_ETHER_ADDR_PRT_FMT,
                     eth_dev->data->port_id, pci_dev->id.vendor_id,
                     pci_dev->id.device_id,
                     hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2],

diff --git a/drivers/net/qede/base/ecore_mcp.c b/drivers/net/qede/base/ecore_mcp.c
index cab089d..ec83b24 100644 (file)
--- a/drivers/net/qede/base/ecore_mcp.c
+++ b/drivers/net/qede/base/ecore_mcp.c
@@ -2611,7 +2611,7 @@ enum _ecore_status_t ecore_mcp_fill_shmem_func_info(struct ecore_hwfn *p_hwfn,
        DP_VERBOSE(p_hwfn, (ECORE_MSG_SP | ECORE_MSG_IFUP),
                   "Read configuration from shmem: pause_on_host %02x"
                    " protocol %02x BW [%02x - %02x]"
-                   " MAC %02x:%02x:%02x:%02x:%02x:%02x wwn port %lx"
+                   " MAC " RTE_ETHER_ADDR_PRT_FMT " wwn port %lx"
                    " node %lx ovlan %04x\n",
                   info->pause_on_host, info->protocol,
                   info->bandwidth_min, info->bandwidth_max,

diff --git a/drivers/net/qede/base/ecore_sriov.c b/drivers/net/qede/base/ecore_sriov.c
index ed8cc69..e12e998 100644 (file)
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -3539,7 +3539,7 @@ static void ecore_iov_vf_mbx_ucast_filter(struct ecore_hwfn *p_hwfn,
 
        DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
                   "VF[%d]: opcode 0x%02x type 0x%02x [%s %s] [vport 0x%02x]"
-                  " MAC %02x:%02x:%02x:%02x:%02x:%02x, vlan 0x%04x\n",
+                  " MAC " RTE_ETHER_ADDR_PRT_FMT ", vlan 0x%04x\n",
                   vf->abs_vf_id, params.opcode, params.type,
                   params.is_rx_filter ? "RX" : "",
                   params.is_tx_filter ? "TX" : "",

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 323d46e..ca6cae3 100644 (file)
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -2750,7 +2750,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
                qed_ops->sriov_configure(edev, pci_dev->max_vfs);
        }
 
-       DP_INFO(edev, "MAC address : %02x:%02x:%02x:%02x:%02x:%02x\n",
+       DP_INFO(edev, "MAC address : " RTE_ETHER_ADDR_PRT_FMT "\n",
                adapter->primary_mac.addr_bytes[0],
                adapter->primary_mac.addr_bytes[1],
                adapter->primary_mac.addr_bytes[2],

diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c
index fc1844d..561a98f 100644 (file)
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -2245,7 +2245,7 @@ nicvf_eth_dev_init(struct rte_eth_dev *eth_dev)
                PMD_INIT_LOG(ERR, "Failed to configure first skip");
                goto malloc_fail;
        }
-       PMD_INIT_LOG(INFO, "Port %d (%x:%x) mac=%02x:%02x:%02x:%02x:%02x:%02x",
+       PMD_INIT_LOG(INFO, "Port %d (%x:%x) mac=" RTE_ETHER_ADDR_PRT_FMT,
                eth_dev->data->port_id, nic->vendor_id, nic->device_id,
                nic->mac_addr[0], nic->mac_addr[1], nic->mac_addr[2],
                nic->mac_addr[3], nic->mac_addr[4], nic->mac_addr[5]);

diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
index 18ed94b..3a91e56 100644 (file)
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -282,7 +282,7 @@ eth_txgbevf_dev_init(struct rte_eth_dev *eth_dev)
                }
                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",
+                            RTE_ETHER_ADDR_PRT_FMT,
                             perm_addr->addr_bytes[0],
                             perm_addr->addr_bytes[1],
                             perm_addr->addr_bytes[2],
@@ -1041,7 +1041,7 @@ txgbevf_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
        err = txgbevf_set_uc_addr_vf(hw, 2, mac_addr->addr_bytes);
        if (err != 0)
                PMD_DRV_LOG(ERR, "Unable to add MAC address "
-                           "%02x:%02x:%02x:%02x:%02x:%02x - err=%d",
+                           RTE_ETHER_ADDR_PRT_FMT " - err=%d",
                            mac_addr->addr_bytes[0],
                            mac_addr->addr_bytes[1],
                            mac_addr->addr_bytes[2],
@@ -1090,7 +1090,7 @@ txgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index)
                if (err != 0)
                        PMD_DRV_LOG(ERR,
                                    "Adding again MAC address "
-                                   "%02x:%02x:%02x:%02x:%02x:%02x failed "
+                                   RTE_ETHER_ADDR_PRT_FMT " failed "
                                    "err=%d",
                                    mac_addr->addr_bytes[0],
                                    mac_addr->addr_bytes[1],

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index e58085a..9ca8bae 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1759,7 +1759,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
        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",
+                    "PORT MAC: " RTE_ETHER_ADDR_PRT_FMT,
                     hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2],
                     hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]);
 
@@ -1840,7 +1840,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
                                config->max_virtqueue_pairs);
                PMD_INIT_LOG(DEBUG, "config->status=%d", config->status);
                PMD_INIT_LOG(DEBUG,
-                               "PORT MAC: %02X:%02X:%02X:%02X:%02X:%02X",
+                               "PORT MAC: " RTE_ETHER_ADDR_PRT_FMT,
                                config->mac[0], config->mac[1],
                                config->mac[2], config->mac[3],
                                config->mac[4], config->mac[5]);

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 1a32912..2f40ae9 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -371,7 +371,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
        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",
+       PMD_INIT_LOG(DEBUG, "MAC Address : " RTE_ETHER_ADDR_PRT_FMT,
                     hw->perm_addr[0], hw->perm_addr[1], hw->perm_addr[2],
                     hw->perm_addr[3], hw->perm_addr[4], hw->perm_addr[5]);
 
@@ -575,7 +575,7 @@ vmxnet3_write_mac(struct vmxnet3_hw *hw, const uint8_t *addr)
        uint32_t val;
 
        PMD_INIT_LOG(DEBUG,
-                    "Writing MAC Address : %02x:%02x:%02x:%02x:%02x:%02x",
+                    "Writing MAC Address : " RTE_ETHER_ADDR_PRT_FMT,
                     addr[0], addr[1], addr[2],
                     addr[3], addr[4], addr[5]);
 

diff --git a/examples/bbdev_app/main.c b/examples/bbdev_app/main.c
index 5251db0..eeb851e 100644 (file)
--- a/examples/bbdev_app/main.c
+++ b/examples/bbdev_app/main.c
@@ -285,7 +285,7 @@ signal_handler(int signum)
 static void
 print_mac(unsigned int portid, struct rte_ether_addr *bbdev_ports_eth_address)
 {
-       printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
+       printf("Port %u, MAC address: " RTE_ETHER_ADDR_PRT_FMT "\n\n",
                        (unsigned int) portid,
                        bbdev_ports_eth_address->addr_bytes[0],
                        bbdev_ports_eth_address->addr_bytes[1],

diff --git a/examples/ethtool/ethtool-app/ethapp.c b/examples/ethtool/ethtool-app/ethapp.c
index 36a1c37..5ff0060 100644 (file)
--- a/examples/ethtool/ethtool-app/ethapp.c
+++ b/examples/ethtool/ethtool-app/ethapp.c
@@ -498,7 +498,7 @@ pcmd_macaddr_callback(void *ptr_params,
                stat = rte_ethtool_net_get_mac_addr(params->port, &mac_addr);
                if (stat == 0) {
                        printf(
-                               "Port %i MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
+                               "Port %i MAC Address: " RTE_ETHER_ADDR_PRT_FMT "\n",
                                params->port,
                                mac_addr.addr_bytes[0],
                                mac_addr.addr_bytes[1],

diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c
index 0c41318..6ac9ca4 100644 (file)
--- a/examples/ioat/ioatfwd.c
+++ b/examples/ioat/ioatfwd.c
@@ -925,7 +925,7 @@ port_init(uint16_t portid, struct rte_mempool *mbuf_pool, uint16_t nb_queues)
        rte_eth_promiscuous_enable(portid);
        /* >8 End of RX port is set in promiscuous mode. */
 
-       printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
+       printf("Port %u, MAC address: " RTE_ETHER_ADDR_PRT_FMT "\n\n",
                        portid,
                        ioat_ports_eth_addr[portid].addr_bytes[0],
                        ioat_ports_eth_addr[portid].addr_bytes[1],

diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index ec4acf0..f4b208b 100644 (file)
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -272,7 +272,7 @@ print_link_info(struct link *link, char *out, size_t out_size)
        snprintf(out, out_size,
                "\n"
                "%s: flags=<%s> mtu %u\n"
-               "\tether %02X:%02X:%02X:%02X:%02X:%02X rxqueues %u txqueues %u\n"
+               "\tether " RTE_ETHER_ADDR_PRT_FMT " rxqueues %u txqueues %u\n"
                "\tport# %u  speed %s\n"
                "\tRX packets %" PRIu64"  bytes %" PRIu64"\n"
                "\tRX errors %" PRIu64"  missed %" PRIu64"  no-mbuf %" PRIu64"\n"
@@ -4776,7 +4776,7 @@ cmd_pipeline_table_rule_delete_default(char **tokens,
 static void
 ether_addr_show(FILE *f, struct rte_ether_addr *addr)
 {
-       fprintf(f, "%02x:%02x:%02x:%02x:%02x:%02x",
+       fprintf(f, RTE_ETHER_ADDR_PRT_FMT,
                (uint32_t)addr->addr_bytes[0], (uint32_t)addr->addr_bytes[1],
                (uint32_t)addr->addr_bytes[2], (uint32_t)addr->addr_bytes[3],
                (uint32_t)addr->addr_bytes[4], (uint32_t)addr->addr_bytes[5]);

diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 5f539c4..f128e64 100644 (file)
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -2701,7 +2701,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
                        return -1;
                }
 
-               printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
+               printf("Port %u, MAC address: " RTE_ETHER_ADDR_PRT_FMT "\n\n",
                                portid,
                                l2fwd_ports_eth_addr[portid].addr_bytes[0],
                                l2fwd_ports_eth_addr[portid].addr_bytes[1],

diff --git a/examples/l2fwd-event/l2fwd_common.c b/examples/l2fwd-event/l2fwd_common.c
index b8c1e02..7f6a0cc 100644 (file)
--- a/examples/l2fwd-event/l2fwd_common.c
+++ b/examples/l2fwd-event/l2fwd_common.c
@@ -108,7 +108,7 @@ l2fwd_event_init_ports(struct l2fwd_resources *rsrc)
 
                rte_eth_promiscuous_enable(port_id);
 
-               printf("Port %u,MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
+               printf("Port %u,MAC address: " RTE_ETHER_ADDR_PRT_FMT "\n\n",
                        port_id,
                        rsrc->eth_addr[port_id].addr_bytes[0],
                        rsrc->eth_addr[port_id].addr_bytes[1],

diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index bbb4a27..6406095 100644 (file)
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -955,7 +955,7 @@ main(int argc, char **argv)
 
                }
 
-               printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
+               printf("Port %u, MAC address: " RTE_ETHER_ADDR_PRT_FMT "\n\n",
                                portid,
                                l2fwd_ports_eth_addr[portid].addr_bytes[0],
                                l2fwd_ports_eth_addr[portid].addr_bytes[1],

diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 4e1a17c..bc160c6 100644 (file)
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -730,7 +730,7 @@ main(int argc, char **argv)
                                 rte_strerror(-ret), portid);
 
                printf("Port %u, MAC address: "
-                       "%02X:%02X:%02X:%02X:%02X:%02X\n\n",
+                       RTE_ETHER_ADDR_PRT_FMT "\n\n",
                        portid,
                        l2fwd_ports_eth_addr[portid].addr_bytes[0],
                        l2fwd_ports_eth_addr[portid].addr_bytes[1],

diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 911e40c..272d817 100644 (file)
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -879,7 +879,7 @@ main(int argc, char **argv)
                                 "rte_eth_promiscuous_enable:err=%s, port=%u\n",
                                 rte_strerror(-ret), portid);
 
-               printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
+               printf("Port %u, MAC address: " RTE_ETHER_ADDR_PRT_FMT "\n\n",
                                portid,
                                l2fwd_ports_eth_addr[portid].addr_bytes[0],
                                l2fwd_ports_eth_addr[portid].addr_bytes[1],

diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c
index 7470aa5..467f339 100644 (file)
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -725,7 +725,7 @@ main(int argc, char **argv)
                                "rte_eth_promiscuous_enable: err=%s, port=%u\n",
                                rte_strerror(-ret), portid);
 
-               printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
+               printf("Port %u, MAC address: " RTE_ETHER_ADDR_PRT_FMT "\n\n",
                                (unsigned) portid,
                                lsi_ports_eth_addr[portid].addr_bytes[0],
                                lsi_ports_eth_addr[portid].addr_bytes[1],

diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c
index 1e2dd9d..5ee9567 100644 (file)
--- a/examples/pipeline/cli.c
+++ b/examples/pipeline/cli.c
@@ -376,7 +376,7 @@ print_link_info(struct link *link, char *out, size_t out_size)
        snprintf(out, out_size,
                "\n"
                "%s: flags=<%s> mtu %u\n"
-               "\tether %02X:%02X:%02X:%02X:%02X:%02X rxqueues %u txqueues %u\n"
+               "\tether " RTE_ETHER_ADDR_PRT_FMT " rxqueues %u txqueues %u\n"
                "\tport# %u  speed %s\n"
                "\tRX packets %" PRIu64"  bytes %" PRIu64"\n"
                "\tRX errors %" PRIu64"  missed %" PRIu64"  no-mbuf %" PRIu64"\n"

diff --git a/examples/server_node_efd/server/main.c b/examples/server_node_efd/server/main.c
index 7d07131..81a9425 100644 (file)
--- a/examples/server_node_efd/server/main.c
+++ b/examples/server_node_efd/server/main.c
@@ -84,7 +84,7 @@ get_printable_mac_addr(uint16_t port)
                }
 
                snprintf(addresses[port], sizeof(addresses[port]),
-                               "%02x:%02x:%02x:%02x:%02x:%02x\n",
+                               RTE_ETHER_ADDR_PRT_FMT "\n",
                                mac.addr_bytes[0], mac.addr_bytes[1],
                                mac.addr_bytes[2], mac.addr_bytes[3],
                                mac.addr_bytes[4], mac.addr_bytes[5]);

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index bc3d71c..a27bc95 100644 (file)
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -778,7 +778,7 @@ link_vmdq(struct vhost_dev *vdev, struct rte_mbuf *m)
 
        /* Print out VMDQ registration info. */
        RTE_LOG(INFO, VHOST_DATA,
-               "(%d) mac %02x:%02x:%02x:%02x:%02x:%02x and vlan %d registered\n",
+               "(%d) mac " RTE_ETHER_ADDR_PRT_FMT " and vlan %d registered\n",
                vdev->vid,
                vdev->mac_address.addr_bytes[0], vdev->mac_address.addr_bytes[1],
                vdev->mac_address.addr_bytes[2], vdev->mac_address.addr_bytes[3],

diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c
index d3bc19f..4b646b9 100644 (file)
--- a/examples/vmdq/main.c
+++ b/examples/vmdq/main.c
@@ -334,7 +334,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
                mac = pool_addr_template;
                mac.addr_bytes[4] = port;
                mac.addr_bytes[5] = q;
-               printf("Port %u vmdq pool %u set mac %02x:%02x:%02x:%02x:%02x:%02x\n",
+               printf("Port %u vmdq pool %u set mac " RTE_ETHER_ADDR_PRT_FMT "\n",
                        port, q,
                        mac.addr_bytes[0], mac.addr_bytes[1],
                        mac.addr_bytes[2], mac.addr_bytes[3],

diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 685a03b..f653238 100644 (file)
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -359,7 +359,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
                mac = pool_addr_template;
                mac.addr_bytes[4] = port;
                mac.addr_bytes[5] = q;
-               printf("Port %u vmdq pool %u set mac %02x:%02x:%02x:%02x:%02x:%02x\n",
+               printf("Port %u vmdq pool %u set mac " RTE_ETHER_ADDR_PRT_FMT "\n",
                        port, q,
                        mac.addr_bytes[0], mac.addr_bytes[1],
                        mac.addr_bytes[2], mac.addr_bytes[3],

diff --git a/lib/net/rte_ether.c b/lib/net/rte_ether.c
index 3460583..9603a52 100644 (file)
--- a/lib/net/rte_ether.c
+++ b/lib/net/rte_ether.c
@@ -26,7 +26,7 @@ void
 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",
+       snprintf(buf, size, RTE_ETHER_ADDR_PRT_FMT,
                 eth_addr->addr_bytes[0],
                 eth_addr->addr_bytes[1],
                 eth_addr->addr_bytes[2],

diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h
index 7ee5e9a..8d126d4 100644 (file)
--- a/lib/net/rte_ether.h
+++ b/lib/net/rte_ether.h
@@ -221,6 +221,11 @@ rte_ether_addr_copy(const struct rte_ether_addr *__restrict ea_from,
        *ea_to = *ea_from;
 }
 
+/**
+ * Macro to print six-bytes of MAC address in hex format
+ */
+#define RTE_ETHER_ADDR_PRT_FMT     "%02X:%02X:%02X:%02X:%02X:%02X"
+
 #define RTE_ETHER_ADDR_FMT_SIZE         18
 /**
  * Format 48bits Ethernet address in pattern xx:xx:xx:xx:xx:xx.

diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 29a4c9a..7b9f26b 100644 (file)
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2327,7 +2327,7 @@ vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg,
                return RTE_VHOST_MSG_RESULT_ERR;
 
        VHOST_LOG_CONFIG(DEBUG,
-               ":: mac: %02x:%02x:%02x:%02x:%02x:%02x\n",
+               ":: mac: " RTE_ETHER_ADDR_PRT_FMT "\n",
                mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
        memcpy(dev->mac.addr_bytes, mac, 6);