Skip to contentSkip to conversation

octeontx2-pf: replace usage of found with dedicated list iterator variable

PATCH New Jakob Koschel 1 participant 1 message Mar 24, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 octeontx2-pf: replace usage of found with dedicated list iterator variable

To move the list iterator variable into the list_for_each_entry_*() macro in the future it should be avoided to use the list iterator variable after the loop body.

To *never* use the list iterator variable after the loop it was concluded to use a separate iterator variable instead of a found boolean [1].

This removes the need to use a found variable and simply checking if the variable was set, can determine if the break/goto was hit.

---
 .../net/ethernet/marvell/octeontx2/nic/otx2_flows.c   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c +5 -6
index 77a13fb555fb..e47a7588f6d3 100644
@@ -1115,9 +1115,8 @@ static int otx2_remove_flow_msg(struct otx2_nic *pfvf, u16 entry, bool all)
 
 static void otx2_update_rem_pfmac(struct otx2_nic *pfvf, int req)
 {
-	struct otx2_flow *iter;
+	struct otx2_flow *flow = NULL, *iter;
 	struct ethhdr *eth_hdr;
-	bool found = false;
 
 	list_for_each_entry(iter, &pfvf->flow_cfg->flow_list, list) {
 		if (iter->dmac_filter && iter->entry == 0) {
@@ -1126,7 +1125,7 @@ static void otx2_update_rem_pfmac(struct otx2_nic *pfvf, int req)
 				otx2_dmacflt_remove(pfvf, eth_hdr->h_dest,
 						    0);
 				clear_bit(0, &pfvf->flow_cfg->dmacflt_bmap);
-				found = true;
+				flow = iter;
 			} else {
 				ether_addr_copy(eth_hdr->h_dest,
 						pfvf->netdev->dev_addr);
@@ -1136,9 +1135,9 @@ static void otx2_update_rem_pfmac(struct otx2_nic *pfvf, int req)
 		}
 	}
 
-	if (found) {
-		list_del(&iter->list);
-		kfree(iter);
+	if (flow) {
+		list_del(&flow->list);
+		kfree(flow);
 		pfvf->flow_cfg->nr_flows--;
 	}
 }

base-commit: f443e374ae131c168a065ea1748feac6b2e76613

Signature · 1 line
2.25.1