[PATCH v2 1/3] examples/l3fwd: validate ptype only for type of traffic sent

[Kamalakshitha Aligeri <kamalakshitha.aligeri@arm.com>]

The check_ptype function is not considering the ptype of the incoming
traffic. --parse-ptype flag must be provided only when the NIC does not
support parsing the ptype of the incoming traffic

Suggested-by: Nathan Brown <nathan.brown@arm.com>
Signed-off-by: Kamalakshitha Aligeri <kamalakshitha.aligeri@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Reviewed-by: Nathan Brown <nathan.brown@arm.com>
Reviewed-by: Feifei Wang <feifei.wang2@arm.com>
---
 examples/l3fwd/l3fwd_em.c  |  8 +++++---
 examples/l3fwd/l3fwd_lpm.c | 13 +++++++------
 examples/l3fwd/main.c      |  5 ++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index a203dc9e46..682ad343d7 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -507,12 +507,14 @@ em_check_ptype(int portid)
 		}
 	}

-	if (ptype_l3_ipv4_ext == 0)
+	if (!ipv6 && !ptype_l3_ipv4_ext) {
 		printf("port %d cannot parse RTE_PTYPE_L3_IPV4_EXT\n", portid);
-	if (ptype_l3_ipv6_ext == 0)
+		return 0;
+	}
+	if (ipv6 && !ptype_l3_ipv6_ext) {
 		printf("port %d cannot parse RTE_PTYPE_L3_IPV6_EXT\n", portid);
-	if (!ptype_l3_ipv4_ext || !ptype_l3_ipv6_ext)
 		return 0;
+	}

 	if (ptype_l4_tcp == 0)
 		printf("port %d cannot parse RTE_PTYPE_L4_TCP\n", portid);
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 22d7f61a42..1ac78281f9 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -667,16 +667,17 @@ lpm_check_ptype(int portid)
 			ptype_l3_ipv6 = 1;
 	}

-	if (ptype_l3_ipv4 == 0)
+	if (!ipv6 && !ptype_l3_ipv4) {
 		printf("port %d cannot parse RTE_PTYPE_L3_IPV4\n", portid);
+		return 0;
+	}

-	if (ptype_l3_ipv6 == 0)
+	if (ipv6 && !ptype_l3_ipv6) {
 		printf("port %d cannot parse RTE_PTYPE_L3_IPV6\n", portid);
+		return 0;
+	}

-	if (ptype_l3_ipv4 && ptype_l3_ipv6)
-		return 1;
-
-	return 0;
+	return 1;

 }

diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 5198ff30dd..71a3018036 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -964,12 +964,11 @@ parse_args(int argc, char **argv)
 	}

 	/*
-	 * ipv6 and hash flags are valid only for
-	 * exact match, reset them to default for
+	 * hash flag is valid only for
+	 * exact match, reset it to default for
 	 * longest-prefix match.
 	 */
 	if (lookup_mode == L3FWD_LOOKUP_LPM) {
-		ipv6 = 0;
 		hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
 	}

--
2.25.1