<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Tue, Sep 15, 2026 at 5:09 AM Evgeny Sokolov <<a href="mailto:Evgeny.Sokolov@infotecs.ru">Evgeny.Sokolov@infotecs.ru</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Sokolov Evgeny <<a href="mailto:Evgeny.Sokolov@infotecs.ru" target="_blank">Evgeny.Sokolov@infotecs.ru</a>><br>
<br>
Previous validation guarantees that nvgre_spec and nvgre_mask are<br>
both non-NULL when this code is reached.<br>
<br>
Remove the redundant condition and execute the enclosed code<br>
directly.<br>
<br>
Signed-off-by: Sokolov Evgeny <<a href="mailto:Evgeny.Sokolov@infotecs.ru" target="_blank">Evgeny.Sokolov@infotecs.ru</a>><br>
Cc: <a href="mailto:stable@dpdk.org" target="_blank">stable@dpdk.org</a><br>
---<br>
drivers/net/bnxt/bnxt_flow.c | 36 +++++++++++++++++-------------------<br>
1 file changed, 17 insertions(+), 19 deletions(-)<br>
<br>
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c<br>
index a2e590540b..4a38c036de 100644<br>
--- a/drivers/net/bnxt/bnxt_flow.c<br>
+++ b/drivers/net/bnxt/bnxt_flow.c<br>
@@ -632,26 +632,24 @@ bnxt_validate_and_parse_flow_type(const struct rte_flow_attr *attr,<br>
return -rte_errno;<br>
}<br>
<br>
- if (nvgre_spec && nvgre_mask) {<br>
- tni_masked =<br>
- !!memcmp(nvgre_mask->tni, tni_mask,<br>
- RTE_DIM(tni_mask));<br>
- if (tni_masked) {<br>
- rte_flow_error_set<br>
- (error,<br>
- EINVAL,<br>
- RTE_FLOW_ERROR_TYPE_ITEM,<br>
- item,<br>
- "Invalid TNI mask");<br>
- return -rte_errno;<br>
- }<br>
- rte_memcpy(((uint8_t *)&tenant_id_be + 1),<br>
- nvgre_spec->tni, 3);<br>
- filter->vni =<br>
- rte_be_to_cpu_32(tenant_id_be);<br>
- filter->tunnel_type =<br>
- CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE;<br>
+ tni_masked =<br>
+ !!memcmp(nvgre_mask->tni, tni_mask,<br>
+ RTE_DIM(tni_mask));<br>
+ if (tni_masked) {<br>
+ rte_flow_error_set<br>
+ (error,<br>
+ EINVAL,<br>
+ RTE_FLOW_ERROR_TYPE_ITEM,<br>
+ item,<br>
+ "Invalid TNI mask");<br>
+ return -rte_errno;<br>
}<br>
+ rte_memcpy(((uint8_t *)&tenant_id_be + 1),<br>
+ nvgre_spec->tni, 3);<br>
+ filter->vni =<br>
+ rte_be_to_cpu_32(tenant_id_be);<br>
+ filter->tunnel_type =<br>
+ CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE;<br>
break;<br>
<br>
case RTE_FLOW_ITEM_TYPE_GRE:<br>
--</blockquote><div><span style="font-family:Calibri;font-size:11pt;background-color:transparent">Acked-by: Kishore
Padmanabha <<a href="mailto:kishore.padmanabha@broadcom.com">kishore.padmanabha@broadcom.com</a>></span> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <br>
2.30.2<br>
<br>
</blockquote></div></div>