[PATCH 2/2] common/cnxk: fix VLAN check for inner header

[Harman Kalra]

Adding the has vlan check in inner headers i.e in LF layer. If
has_vlan is 0 it should be masked out while installing flow rule.

Fixes: c34ea71b878d ("common/cnxk: add NPC parsing API")
Cc: sta...@dpdk.org

Signed-off-by: Harman Kalra <hka...@marvell.com>
---
 drivers/common/cnxk/roc_npc_parse.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/common/cnxk/roc_npc_parse.c 
b/drivers/common/cnxk/roc_npc_parse.c
index 9ceb707ebb..571d6b8e5d 100644
--- a/drivers/common/cnxk/roc_npc_parse.c
+++ b/drivers/common/cnxk/roc_npc_parse.c
@@ -1097,6 +1097,7 @@ npc_parse_lf(struct npc_parse_state *pst)
 {
        const struct roc_npc_item_info *pattern, *last_pattern;
        char hw_mask[NPC_MAX_EXTRACT_HW_LEN];
+       const struct roc_npc_flow_item_eth *eth_item;
        struct npc_parse_item_info info;
        int lid, lt, lflags;
        int nr_vlans = 0;
@@ -1113,10 +1114,12 @@ npc_parse_lf(struct npc_parse_state *pst)
        lt = NPC_LT_LF_TU_ETHER;
        lflags = 0;
 
+       eth_item = pst->pattern->spec;
+
        /* No match support for vlan tags */
        info.def_mask = NULL;
        info.hw_mask = NULL;
-       info.len = pst->pattern->size;
+       info.len = sizeof(eth_item->hdr);
        info.spec = NULL;
        info.mask = NULL;
        info.hw_hdr_len = 0;
@@ -1147,12 +1150,15 @@ npc_parse_lf(struct npc_parse_state *pst)
        }
 
        info.hw_mask = &hw_mask;
-       info.len = pst->pattern->size;
+       info.len = sizeof(eth_item->hdr);
        info.hw_hdr_len = 0;
        npc_get_hw_supp_mask(pst, &info, lid, lt);
        info.spec = NULL;
        info.mask = NULL;
 
+       if (eth_item && eth_item->has_vlan)
+               pst->set_vlan_ltype_mask = true;
+
        rc = npc_parse_item_basic(pst->pattern, &info);
        if (rc != 0)
                return rc;
-- 
2.18.0