X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fdpaa2%2Fdpaa2_flow.c;h=22126503202efeb65eda620d004baaf1f280722a;hb=50556c88104cbc0096e90f454dc137258be2099f;hp=98f68139b6188302eb25ce7792e78b972e087504;hpb=b7ed955a20eee5979eaecc9fab500a176e2741c5;p=dpdk.git

diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c
index 98f68139b6..2212650320 100644
--- 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;
 }
@@ -1505,7 +1505,8 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
 			index = flow->index + (flow->tc_id * nic_attr.fs_entries);
 			ret = dpni_add_qos_entry(dpni, CMD_PRI_LOW,
 						priv->token, &flow->rule,
-						flow->tc_id, index);
+						flow->tc_id, index,
+						0, 0);
 			if (ret < 0) {
 				DPAA2_PMD_ERR(
 				"Error in addnig entry to QoS table(%d)", ret);
@@ -1607,7 +1608,7 @@ dpaa2_generic_flow_set(struct rte_flow *flow,
 			index = flow->index + (flow->tc_id * nic_attr.fs_entries);
 			ret = dpni_add_qos_entry(dpni, CMD_PRI_LOW, priv->token,
 						&flow->rule, flow->tc_id,
-						index);
+						index, 0, 0);
 			if (ret < 0) {
 				DPAA2_PMD_ERR(
 				"Error in entry addition in QoS table(%d)",
@@ -1734,7 +1735,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;
 				}