Commit 22ab6b94 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-pktgen-fix-checkpatch-code-style-errors-warnings' 

Peter Seiderer says:

====================
net: pktgen: fix checkpatch code style errors/warnings

Fix checkpatch detected code style errors/warnings detected in
the file net/core/pktgen.c (remaining checkpatch checks will be addressed
in a follow up patch set).
====================

Link: https://patch.msgid.link/20250415112916.113455-1-ps.report@gmx.net


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 4a1f69b9 422cf22a

net/core/pktgen.c

+10 −14
Original line number Diff line number Diff line
@@ -1313,9 +1313,9 @@ static ssize_t pktgen_if_write(struct file *file, 
				put_page(pkt_dev->page);

				pkt_dev->page = NULL;

			}

		}

		else

		} else {

			sprintf(pg_result, "ERROR: node not possible");

		}

		return count;

	}

	if (!strcmp(name, "xmit_mode")) {
@@ -1419,8 +1419,7 @@ static ssize_t pktgen_if_write(struct file *file, 
			return -EFAULT;

		buf[len] = 0;

		if (strcmp(buf, pkt_dev->dst_min) != 0) {

			memset(pkt_dev->dst_min, 0, sizeof(pkt_dev->dst_min));

			strcpy(pkt_dev->dst_min, buf);

			strscpy_pad(pkt_dev->dst_min, buf);

			pkt_dev->daddr_min = in_aton(pkt_dev->dst_min);

			pkt_dev->cur_daddr = pkt_dev->daddr_min;

		}
@@ -1440,8 +1439,7 @@ static ssize_t pktgen_if_write(struct file *file, 
			return -EFAULT;

		buf[len] = 0;

		if (strcmp(buf, pkt_dev->dst_max) != 0) {

			memset(pkt_dev->dst_max, 0, sizeof(pkt_dev->dst_max));

			strcpy(pkt_dev->dst_max, buf);

			strscpy_pad(pkt_dev->dst_max, buf);

			pkt_dev->daddr_max = in_aton(pkt_dev->dst_max);

			pkt_dev->cur_daddr = pkt_dev->daddr_max;

		}
@@ -1550,8 +1548,7 @@ static ssize_t pktgen_if_write(struct file *file, 
			return -EFAULT;

		buf[len] = 0;

		if (strcmp(buf, pkt_dev->src_min) != 0) {

			memset(pkt_dev->src_min, 0, sizeof(pkt_dev->src_min));

			strcpy(pkt_dev->src_min, buf);

			strscpy_pad(pkt_dev->src_min, buf);

			pkt_dev->saddr_min = in_aton(pkt_dev->src_min);

			pkt_dev->cur_saddr = pkt_dev->saddr_min;

		}
@@ -1571,8 +1568,7 @@ static ssize_t pktgen_if_write(struct file *file, 
			return -EFAULT;

		buf[len] = 0;

		if (strcmp(buf, pkt_dev->src_max) != 0) {

			memset(pkt_dev->src_max, 0, sizeof(pkt_dev->src_max));

			strcpy(pkt_dev->src_max, buf);

			strscpy_pad(pkt_dev->src_max, buf);

			pkt_dev->saddr_max = in_aton(pkt_dev->src_max);

			pkt_dev->cur_saddr = pkt_dev->saddr_max;

		}
@@ -3228,11 +3224,11 @@ static void pktgen_run(struct pktgen_thread *t) 


			set_pkt_overhead(pkt_dev);



			strcpy(pkt_dev->result, "Starting");

			strscpy(pkt_dev->result, "Starting");

			pkt_dev->running = 1;	/* Cranke yeself! */

			started++;

		} else

			strcpy(pkt_dev->result, "Error starting");

			strscpy(pkt_dev->result, "Error starting");

	}

	rcu_read_unlock();

	if (started)
@@ -3846,7 +3842,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) 
	if (!pkt_dev)

		return -ENOMEM;



	strcpy(pkt_dev->odevname, ifname);

	strscpy(pkt_dev->odevname, ifname);

	pkt_dev->flows = vzalloc_node(array_size(MAX_CFLOWS,

						 sizeof(struct flow_state)),

				      node);