From: Beilei Xing <beilei.xing@intel.com>
Date: Mon, 6 Feb 2017 05:29:56 +0000 (+0800)
Subject: net/i40e: fix parsing tunnel filter
X-Git-Tag: spdx-start~4536
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=4bc4a89e0fc0809bb2213aaec32ec86d480a513b;p=dpdk.git

net/i40e: fix parsing tunnel filter

VNI of VXLAN is parsed wrongly. The root cause is that
array VNI in item VXLAN uses network byte ordering.

Fixes: d416530e6358 ("net/i40e: parse tunnel filter")

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
---

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 76bb332091..c14eb22f1b 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -1223,6 +1223,7 @@ i40e_flow_parse_vxlan_pattern(const struct rte_flow_item *pattern,
 	bool is_vni_masked = 0;
 	enum rte_flow_item_type item_type;
 	bool vxlan_flag = 0;
+	uint32_t tenant_id_be = 0;
 
 	for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
 		if (item->last) {
@@ -1364,8 +1365,9 @@ i40e_flow_parse_vxlan_pattern(const struct rte_flow_item *pattern,
 			& I40E_TCI_MASK;
 		if (vxlan_spec && vxlan_mask && !is_vni_masked) {
 			/* If there's vxlan */
-			rte_memcpy(&filter->tenant_id, vxlan_spec->vni,
-				   RTE_DIM(vxlan_spec->vni));
+			rte_memcpy(((uint8_t *)&tenant_id_be + 1),
+				   vxlan_spec->vni, 3);
+			filter->tenant_id = rte_be_to_cpu_32(tenant_id_be);
 			if (!o_eth_spec && !o_eth_mask &&
 				i_eth_spec && i_eth_mask)
 				filter->filter_type =
@@ -1402,8 +1404,9 @@ i40e_flow_parse_vxlan_pattern(const struct rte_flow_item *pattern,
 		/* If there's no inner vlan */
 		if (vxlan_spec && vxlan_mask && !is_vni_masked) {
 			/* If there's vxlan */
-			rte_memcpy(&filter->tenant_id, vxlan_spec->vni,
-				   RTE_DIM(vxlan_spec->vni));
+			rte_memcpy(((uint8_t *)&tenant_id_be + 1),
+				   vxlan_spec->vni, 3);
+			filter->tenant_id = rte_be_to_cpu_32(tenant_id_be);
 			if (!o_eth_spec && !o_eth_mask &&
 				i_eth_spec && i_eth_mask)
 				filter->filter_type =