diff options
Diffstat (limited to 'drivers/net/enic')
| -rw-r--r-- | drivers/net/enic/enic_ethdev.c | 13 | ||||
| -rw-r--r-- | drivers/net/enic/enic_main.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 71e1b9c..3b55eba 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -648,7 +648,7 @@ static void debug_log_add_del_addr(struct rte_ether_addr *addr, bool add) { char mac_str[ETHER_ADDR_FMT_SIZE]; - ether_format_addr(mac_str, ETHER_ADDR_FMT_SIZE, addr); + rte_ether_format_addr(mac_str, ETHER_ADDR_FMT_SIZE, addr); PMD_INIT_LOG(DEBUG, " %s address %s\n", add ? "add" : "remove", mac_str); } @@ -668,9 +668,10 @@ static int enicpmd_set_mc_addr_list(struct rte_eth_dev *eth_dev, /* Validate the given addresses first */ for (i = 0; i < nb_mc_addr && mc_addr_set != NULL; i++) { addr = &mc_addr_set[i]; - if (!is_multicast_ether_addr(addr) || - is_broadcast_ether_addr(addr)) { - ether_format_addr(mac_str, ETHER_ADDR_FMT_SIZE, addr); + if (!rte_is_multicast_ether_addr(addr) || + rte_is_broadcast_ether_addr(addr)) { + rte_ether_format_addr(mac_str, + ETHER_ADDR_FMT_SIZE, addr); PMD_INIT_LOG(ERR, " invalid multicast address %s\n", mac_str); return -EINVAL; @@ -704,7 +705,7 @@ static int enicpmd_set_mc_addr_list(struct rte_eth_dev *eth_dev, for (i = 0; i < enic->mc_count; i++) { addr = &enic->mc_addrs[i]; for (j = 0; j < nb_mc_addr; j++) { - if (is_same_ether_addr(addr, &mc_addr_set[j])) + if (rte_is_same_ether_addr(addr, &mc_addr_set[j])) break; } if (j < nb_mc_addr) @@ -718,7 +719,7 @@ static int enicpmd_set_mc_addr_list(struct rte_eth_dev *eth_dev, for (i = 0; i < nb_mc_addr; i++) { addr = &mc_addr_set[i]; for (j = 0; j < enic->mc_count; j++) { - if (is_same_ether_addr(addr, &enic->mc_addrs[j])) + if (rte_is_same_ether_addr(addr, &enic->mc_addrs[j])) break; } if (j < enic->mc_count) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 6b76839..cbd2839 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1673,7 +1673,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); |