[net-next,v4,09/17] net: pktgen: align some variable declarations to the most common pattern

Commit Message

Peter Seiderer Feb. 5, 2025, 1:11 p.m. UTC

Align some variable declarations (in get_imix_entries and get_labels) to
the most common pattern (int instead of ssize_t/long) and adjust function
return value accordingly.

Signed-off-by: Peter Seiderer <[e-mail]>
---
Changes v3 -> v4
  - new patch (factored out of patch 'net: pktgen: fix access outside of user
    given buffer in pktgen_if_write()')
---
 net/core/pktgen.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Patch

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 4f201a2db2dc..279910367ad4 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -850,12 +850,11 @@  static int strn_len(const char __user * user_buffer, unsigned int maxlen)
  * where each entry consists of size and weight delimited by commas.
  * "size1,weight_1 size2,weight_2 ... size_n,weight_n" for example.
  */
-static ssize_t get_imix_entries(const char __user *buffer,
-				struct pktgen_dev *pkt_dev)
+static int get_imix_entries(const char __user *buffer,
+			    struct pktgen_dev *pkt_dev)
 {
-	int i = 0;
-	long len;
 	char c;
+	int i = 0, len;
 
 	pkt_dev->n_imix_entries = 0;
 
@@ -900,12 +899,11 @@  static ssize_t get_imix_entries(const char __user *buffer,
 	return i;
 }
 
-static ssize_t get_labels(const char __user *buffer, struct pktgen_dev *pkt_dev)
+static int get_labels(const char __user *buffer, struct pktgen_dev *pkt_dev)
 {
-	unsigned int n = 0;
 	char c;
-	ssize_t i = 0;
-	int len;
+	int i = 0, len;
+	unsigned int n = 0;
 
 	pkt_dev->nr_labels = 0;
 	do {