netdev - [PATCH net-next 10/13] net: mscc: ocelot: rename variable 'count' in vcap_data_offset

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 30 Sep 2020 01:27:30 +0300
From:   Vladimir Oltean <vladimir.oltean@....com>
To:     davem@...emloft.net
Cc:     alexandre.belloni@...tlin.com, andrew@...n.ch,
        f.fainelli@...il.com, vivien.didelot@...il.com,
        horatiu.vultur@...rochip.com, joergen.andreasen@...rochip.com,
        allan.nielsen@...rochip.com, alexandru.marginean@....com,
        claudiu.manoil@....com, xiaoliang.yang_1@....com,
        hongbo.wang@....com, netdev@...r.kernel.org, kuba@...nel.org,
        UNGLinuxDriver@...rochip.com
Subject: [PATCH net-next 10/13] net: mscc: ocelot: rename variable 'count' in vcap_data_offset_get()

This gets rid of one of the 2 variables named, very generically,
"count".

Signed-off-by: Vladimir Oltean <vladimir.oltean@....com>
---
Changes since RFC v2:
Patch is new.

 drivers/net/ethernet/mscc/ocelot_vcap.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_vcap.c b/drivers/net/ethernet/mscc/ocelot_vcap.c
index 3f7d3fbaa1fc..1c732e3687d8 100644
--- a/drivers/net/ethernet/mscc/ocelot_vcap.c
+++ b/drivers/net/ethernet/mscc/ocelot_vcap.c
@@ -174,25 +174,25 @@ static void vcap_cache2action(struct ocelot *ocelot,
 static void vcap_data_offset_get(const struct vcap_props *vcap,
 				 struct vcap_data *data, int ix)
 {
-	int i, col, offset, count, cnt, base;
+	int i, col, offset, num_entries_per_row, cnt, base;
 	u32 width = vcap->tg_width;
 
 	switch (data->tg_sw) {
 	case VCAP_TG_FULL:
-		count = 1;
+		num_entries_per_row = 1;
 		break;
 	case VCAP_TG_HALF:
-		count = 2;
+		num_entries_per_row = 2;
 		break;
 	case VCAP_TG_QUARTER:
-		count = 4;
+		num_entries_per_row = 4;
 		break;
 	default:
 		return;
 	}
 
-	col = (ix % count);
-	cnt = (vcap->sw_count / count);
+	col = (ix % num_entries_per_row);
+	cnt = (vcap->sw_count / num_entries_per_row);
 	base = (vcap->sw_count - col * cnt - cnt);
 	data->tg_value = 0;
 	data->tg_mask = 0;
@@ -203,13 +203,13 @@ static void vcap_data_offset_get(const struct vcap_props *vcap,
 	}
 
 	/* Calculate key/action/counter offsets */
-	col = (count - col - 1);
+	col = (num_entries_per_row - col - 1);
 	data->key_offset = (base * vcap->entry_width) / vcap->sw_count;
 	data->counter_offset = (cnt * col * vcap->counter_width);
 	i = data->type;
 	width = vcap->action_table[i].width;
 	cnt = vcap->action_table[i].count;
-	data->action_offset = (((cnt * col * width) / count) +
+	data->action_offset = (((cnt * col * width) / num_entries_per_row) +
 			      vcap->action_type_width);
 }
 
-- 
2.25.1