net: add rte prefix to ether structures

[dpdk.git] / drivers / net / dpaa2 / dpaa2_flow.c

diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c
index 98f6813..572eb84 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_flow.c
+++ b/drivers/net/dpaa2/dpaa2_flow.c
@@ -214,27 +214,27 @@ dpaa2_configure_flow_eth(struct rte_flow *flow,
        /* Key rule */
        key_iova = flow->rule.key_iova + DPAA2_CLS_RULE_OFFSET_ETH;
        memcpy((void *)key_iova, (const void *)(spec->src.addr_bytes),
-                                               sizeof(struct ether_addr));
-       key_iova += sizeof(struct ether_addr);
+                                               sizeof(struct rte_ether_addr));
+       key_iova += sizeof(struct rte_ether_addr);
        memcpy((void *)key_iova, (const void *)(spec->dst.addr_bytes),
-                                               sizeof(struct ether_addr));
-       key_iova += sizeof(struct ether_addr);
+                                               sizeof(struct rte_ether_addr));
+       key_iova += sizeof(struct rte_ether_addr);
        memcpy((void *)key_iova, (const void *)(&spec->type),
                                                sizeof(rte_be16_t));
 
        /* Key mask */
        mask_iova = flow->rule.mask_iova + DPAA2_CLS_RULE_OFFSET_ETH;
        memcpy((void *)mask_iova, (const void *)(mask->src.addr_bytes),
-                                               sizeof(struct ether_addr));
-       mask_iova += sizeof(struct ether_addr);
+                                               sizeof(struct rte_ether_addr));
+       mask_iova += sizeof(struct rte_ether_addr);
        memcpy((void *)mask_iova, (const void *)(mask->dst.addr_bytes),
-                                               sizeof(struct ether_addr));
-       mask_iova += sizeof(struct ether_addr);
+                                               sizeof(struct rte_ether_addr));
+       mask_iova += sizeof(struct rte_ether_addr);
        memcpy((void *)mask_iova, (const void *)(&mask->type),
                                                sizeof(rte_be16_t));
 
        flow->rule.key_size = (DPAA2_CLS_RULE_OFFSET_ETH +
-                               ((2  * sizeof(struct ether_addr)) +
+                               ((2  * sizeof(struct rte_ether_addr)) +
                                sizeof(rte_be16_t)));
        return device_configured;
 }
@@ -1734,7 +1734,7 @@ dpaa2_dev_verify_patterns(struct dpaa2_dev_priv *dev_priv,
        /* more than DPKG_MAX_NUM_OF_EXTRACTS. Verify this limitation too. */
        for (i = 0; pattern[i].type != RTE_FLOW_ITEM_TYPE_END; i++) {
                for (j = 0; j < MAX_TCS + 1; j++) {
-                               for (k = 0; k < DPKG_MAX_NUM_OF_EXTRACTS; j++) {
+                               for (k = 0; k < DPKG_MAX_NUM_OF_EXTRACTS; k++) {
                                        if (dev_priv->pattern[j].pattern_type[k] == pattern[i].type)
                                                break;
                                }