net: add rte prefix to ether defines

[dpdk.git] / drivers / net / fm10k / fm10k_ethdev.c

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 47c20c5..a1e3836 100644 (file)
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -613,8 +613,8 @@ 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 ether_addr *)hw->mac.addr,
+               RTE_ETHER_ADDR_LEN * FM10K_MAX_MACADDR_NUM);
+       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;
@@ -1389,6 +1389,15 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
 
        dev_info->hash_key_size = FM10K_RSSRK_SIZE * sizeof(uint32_t);
        dev_info->reta_size = FM10K_MAX_RSS_INDICES;
+       dev_info->flow_type_rss_offloads = ETH_RSS_IPV4 |
+                                       ETH_RSS_IPV6 |
+                                       ETH_RSS_IPV6_EX |
+                                       ETH_RSS_NONFRAG_IPV4_TCP |
+                                       ETH_RSS_NONFRAG_IPV6_TCP |
+                                       ETH_RSS_IPV6_TCP_EX |
+                                       ETH_RSS_NONFRAG_IPV4_UDP |
+                                       ETH_RSS_NONFRAG_IPV6_UDP |
+                                       ETH_RSS_IPV6_UDP_EX;
 
        dev_info->default_rxconf = (struct rte_eth_rxconf) {
                .rx_thresh = {
@@ -1525,7 +1534,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 "
@@ -1664,7 +1673,7 @@ static void fm10k_MAC_filter_set(struct rte_eth_dev *dev,
 /* Add a MAC address, and update filters */
 static int
 fm10k_macaddr_add(struct rte_eth_dev *dev,
-               struct ether_addr *mac_addr,
+               struct rte_ether_addr *mac_addr,
                uint32_t index,
                uint32_t pool)
 {
@@ -3073,7 +3082,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
 
        /* Initialize MAC address(es) */
        dev->data->mac_addrs = rte_zmalloc("fm10k",
-                       ETHER_ADDR_LEN * FM10K_MAX_MACADDR_NUM, 0);
+                       RTE_ETHER_ADDR_LEN * FM10K_MAX_MACADDR_NUM, 0);
        if (dev->data->mac_addrs == NULL) {
                PMD_INIT_LOG(ERR, "Cannot allocate memory for MAC addresses");
                return -ENOMEM;
@@ -3081,16 +3090,16 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
 
        diag = fm10k_read_mac_addr(hw);
 
-       ether_addr_copy((const struct 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 ether_addr *)hw->mac.addr,
+               rte_ether_addr_copy((const struct rte_ether_addr *)hw->mac.addr,
                &dev->data->mac_addrs[0]);
        }