From patchwork Tue Apr 15 11:29:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 14052059 X-Patchwork-Delegate: kuba@kernel.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FDC4292937; Tue, 15 Apr 2025 11:29:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744716575; cv=none; b=OoKv6aKY/moy1cC+E7ZKf0eQeXvGTqnQdiVXfZNuHjZ5jNi8ji01ijLTHR5QoOsuCGViZJ+VSvGJu+9i+Ue7ekG8c78TpoitGiP7870DiwjwIiG2/mxRMuZUOuHh/ILKFxSqFGOwmwtWcnFNtklqlWGgyueleiq++d30XDfoSKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744716575; c=relaxed/simple; bh=QVox7995iH2ZZRjtGKwDZmbEeAIvePR4xMSX9pxpVVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f6K6Z5SYv7kN/fWX8AbJPD2i+yd03v4U2itJNvglVQDRdOVikAbIVrH46E0iPK0ISupWYiEaDRbOlO0XmdLOK6DKKw9C54FAgyt7DVmMuPCcws5QP4G9i6l/uqe2FhgCVbsEvqfonMeQOslvJZkxdcM/bSzigHEsMANtf2qLrEM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net; spf=pass smtp.mailfrom=gmx.net; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b=PdpyHWnr; arc=none smtp.client-ip=212.227.15.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="PdpyHWnr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1744716570; x=1745321370; i=ps.report@gmx.net; bh=QVox7995iH2ZZRjtGKwDZmbEeAIvePR4xMSX9pxpVVs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=PdpyHWnrmt7Lvw5ZJd6OIVH9vsy9ADSOmOL+0EKUfVjl6AVx6Qo7bo6e6nmR/b6y vqAVXyn+QWMmUEUcHd+mKjhCr91gxuEVB6SS5gfyG4GOgwYrVXzbB53oepzpWDd3P 4NfeFoJbdOwNFe9XPUwcm9eIGOuwOb/g2uATPKBzcZ63OYZ8XrG4B/PGy/8kCcq1m lGE2fiVVRWD7zOwmaub+Ki1v+wCR66vhbeZNR8lv3DP2IxCz36xZVd0VCZovh4Fia a6NO2BqgUdfpUgsCra9BZTdc6fqmETk8CSvmNRFLxg/yV3niYQWMZn9dMzmGA7LyT 7KlP3jcS+h+cGIA4gQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.153]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MvK4Z-1tECNv0ijh-016YIp; Tue, 15 Apr 2025 13:29:30 +0200 From: Peter Seiderer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Peter Seiderer Subject: [PATCH net-next v2 1/3] net: pktgen: fix code style (ERROR: else should follow close brace '}') Date: Tue, 15 Apr 2025 13:29:14 +0200 Message-ID: <20250415112916.113455-2-ps.report@gmx.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415112916.113455-1-ps.report@gmx.net> References: <20250415112916.113455-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:F+e5HhFJ/ntrPABsELhyF3ff0BUDT5LLYJI+pd/1o0qvb7PBMX7 hA6n3KgTs2zfOVShinrY5IpyOQjBn8n9aG5Z+zB56XKHrpQgBwP1BMkk4I+FkWo8eV+DNgR ypWi54MQCCkQ4yeWXbQ8XfPVdGdS2YN6DKH4uZaMbEmwtqTW/yRdS4XBxN6HK690VwAovVO 9jI9IGFgqvbrS9HrTDYaQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:MDMQgM6ygUw=;6WuY37m1U1XO4zE3SCsaXKrYBBp I1ujf/af5zqaQyIG++dpYgZI+eUU3/NWgbVwGRZ++Dbz4AnnlhezreotgngGLoRyN5Fx2Ni5a 54Ya3canxhnQtYX5fzydweFqW8SyUXkAXijfPAFQh7p6xs+tVrRaDIz1s05iAQbKo+7PZLUK6 0r+0aYNUEr7W/Jnr6naDvkAGsq4zEbDr7ejqcW+gaTGcDl/gGchA5V0pVrGgmQxDdq3ZACrlF vk2QlBQW+w0dXp7+6BQwlSPMpy/92uhAwzwtF06VJ7myAeGsrzcXAgPvLXtqIXzcegCRffFyS edWdL2Sbqu8YrHCEVDpBBJOOzrSHSo0D1iBt+ebP6aIvO2nXrKTG0MXbyLViSwAgPHn2WxGzk kZQ2oR9HXTUiseYjkYyqjAVkiqTo1+L27IiN8v5FRvreeOVLBL1bHnuYYIiTR0wbv1J6C/WI2 lii/MikGPiDmn8jcKu4OmHZgfm2VW9A19rGwWH5Xe7ZkzYSo5nCEGKEO86z8/IGA2P959gk4m sueCCqflFMqQyUq63xYfjECYGWw3vhnj3xavmbLgUKq7NO0+o+YkGVtEGOZkz27V6UqHwzKyE L9BH0Kx4uaEaU+98Hr/Ici03DdDnDBoUcfAyRTcbiHMuz6ffjGG74Q9QHSx1Qn69RDTwzwgxe 0HLa1m9ZMoO8JSOj2kQy+/W1YfYP4MW+ANTLi/FWjo7+Bh5v+IIvtTitKy9Mi7LsAj9BUr4CG gsgCtqkFa/H73dLzovLBuTk4WUGjsTXUUTFN2lyiBdKwIkxV7CskaDHKf9WjyosxcbiCkf2eY RFxEzMr71V/s+q8uE5F4Y/tQUVyIrOKvf3daRKG4wyA9Zn+dXSz1PIb+8I/1o8WIfSRTRKth5 CBmnqZByoRUgsq2eZe1vMH8/SJPy097y0c5pSmptHpn9DA9c+6rzPx4d1yDEA7Vbn25ZqZHKC 9geS2vIRvQcWOj/CJho/Y5zKtWdt3LB2cP0f1ZONab70epZfyMXA0G6poKtbcDmItBkkEGg91 wIxB7kcsPZVblYBMDMuZPLfoOoHpRuPwfmkjfgjVD6F0fcDdWZiHl9AxNs8/6/StwPUIWD8Z/ pmJ6peoguWpkXsuTMDcXfn1cssJEc9lC9Ersno3TTNlT8Xh6sc5yntKsfQYftzOmhQZ0rTZQ7 McGgop1DqyCYHUP9shiXJtZLqn1YX28SvgLZdAgT0qrUUNJvmWbGdeLFFX7p+/NEyrQuRrw5G 6RksgDI7uIcn7ecthU5T+ut11seAuL65sDb+dnW4Y0cVZKm1Ec5Mk94sptrfQaOmt9gm38nZY MHzf3uE1R6QgSAkmJz/DzaHANCiyPRO4dvUTO/c2xtKKehZrnYeZeIENLR7ZHHhSRnbkWe8Gv 14bgfaqEyDtRcFnjNUuO2sFkg0hqqKxxErVrmDQSiK0GGmgAe2XSlz9BecW8i/1iJw45QMbG0 wjEqCdUqHz+DkTD+fQR5VmbNcM2BeLH4FSqc/VDXjGiTLpSpC X-Patchwork-Delegate: kuba@kernel.org Fix checkpatch code style errors: ERROR: else should follow close brace '}' #1317: FILE: net/core/pktgen.c:1317: + } + else And checkpatch follow up code style check: CHECK: Unbalanced braces around else statement #1316: FILE: net/core/pktgen.c:1316: + } else Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- Changes v1 -> v2: - Additional add braces around the else statement (as suggested by a follow up checkpatch run and by Jakub Kicinski from code review). --- net/core/pktgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index fa30ff0f2464..21206a567843 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -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")) { From patchwork Tue Apr 15 11:29:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 14052060 X-Patchwork-Delegate: kuba@kernel.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BF4F29A3EB; Tue, 15 Apr 2025 11:29:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744716579; cv=none; b=t3Eq0CedFK7buWhyC6tz9Fgk0qexi2/1mq6Q2m5BNLNF72LzrKViIB+IXtjS2jTwz6LWvhOTWQGrZZGTlM/4yaOJm0C7/mSazWNeJ55uoh2m+Oix5atQISNoUi0d6+HPNXFiHGakgVkzTUeGpSgiBe/iG2Y6CQtBMCjHbUKrIOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744716579; c=relaxed/simple; bh=IFlG2H8poFQ+/G0rjtVMAbzUPiCSrZsEYZjQKj9PU/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CWLWKCnCuCbQvGG00TfMuxYI6QftPjYtZXNc8iTqyqC54CgnExFLCatMCP/gO7J3sxVTjhFdw+rhxctMzt7b/o95ss2cee0GpbviSmWqefLwbvhrhCsdn8fdMcbWTBUnE0pRtrqYqdycLpT9Iwk7xflqOYM5lj79+5sewnnoQnk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net; spf=pass smtp.mailfrom=gmx.net; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b=aCLJYOQg; arc=none smtp.client-ip=212.227.15.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="aCLJYOQg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1744716570; x=1745321370; i=ps.report@gmx.net; bh=IFlG2H8poFQ+/G0rjtVMAbzUPiCSrZsEYZjQKj9PU/A=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=aCLJYOQgrJ6zMxnyt1JGoLdsXF2Zc3/oX+ddVamRkiwknemdLtxLmqcdyNWmrUbE PotOcGnrZyf1YT6xok5O8sXnQgno7jzqE12IV30GgOjGc9WkGwKSgoz/hOQ9ZOV+f gDQNTywDyBmbi1PYyJjBlpJT6BcRCXOVo4YXQHbG+mYYnx8dbEnN44x8ruB6kblkI dfDyTxyDLkd/7JSjSB3b1IaCkWEe3Vq0d0jEaGfxs+RZ6fRFhVWFSfvwhyJGtqn/k twQfHjq4/BioWK+0zGeMVS8N6adb1WS/xDmR4uttjBN6ta26B9r9MOWG5koZ7YuY7 5fOUiQwuQ+JtkPT2fw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.153]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MLzFr-1tnG5T1nEX-00XUX9; Tue, 15 Apr 2025 13:29:30 +0200 From: Peter Seiderer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Peter Seiderer Subject: [PATCH net-next v2 2/3] net: pktgen: fix code style (WARNING: please, no space before tabs) Date: Tue, 15 Apr 2025 13:29:15 +0200 Message-ID: <20250415112916.113455-3-ps.report@gmx.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415112916.113455-1-ps.report@gmx.net> References: <20250415112916.113455-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:QpDcqAQgWSc8AXIYHjAAJCCR76D/6csHeeU/ARO7/34K15E94v4 1eteRSG53bQOtEoj945yQj7iTsL1CYdxIloe85dQh46g+c5+pEdUYVFkzqL5VYShGIQGyb7 UAvDWe74gstpEUMQLaD6nMJ5aXGDNOLApRn0ng7kFC9QhwpdUXe65J9c6jaPiKNFJ0/9I5c rsyhoxA/TkcipH/koSJ4w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:5jOzgypVDoI=;FHfQJzHX6wcgems/1ErKbBvjkJi cOyxPRDJH2MhsHk7J3bcaHiBHPPdnSaRwmOdA4GO7gPJUb/r3kej8/y/hAVVCkBB0GVMd6yo2 mmTaenIHQS9WVlABeiVailjqW/72NbzlDuU1a601fZMCXol3Ni8hEZme+LlqG9fPqfV07vVc4 szfmhGFUlYw3f2Zfjj/NJ3AQ+PcFvQJfJG8Zy4xqLtNvmnU6jECyXXEvP5T5NXJYRPxcgCYOV 8HY1ykn3Dvi/IinEeUJx8TGFv9mjLTR9Mm/0wqpS4dJsngZpAwSo/LHq80UmUCmNTuJIBweIz 8z1MaIdnuw1nr5UBWujKOcv1kNwDAH0mMdkCsS4zjK2hrN6clUE8DOQocDY73xowCHSu3iEjl VrT5LCrce6XX4HRiBxZtobxNMC7eoWDTy7rWLc1qfjuu34iN1X2m6KJUo5/J9V8tFuy3twMJ9 gCwSUV5wdMjB1ZB2/jvGmJXyY1pnWMUibDrl3se7KZIraimkVZIpoIrpU/UStcCVVjHJl7cHI IEA/IgHCeZDtd79OEqRSFslRLpopA2wPyqwzsNAXUiiBNf7gUrcCWiRPzKn0jUCxI3n4Hn53+ /3oBMQ/ZutXFV73fBNGJ4M1xSlDwMVYZNJZafrZ5OEz/RuQyebNRBotTdO8aV1NLvDS5p9r6a NX6PySlTXuCXDuK6SJLreZYiES1p9N16c/+QgfpJVRXl00/aEkOZZ7DLm3roiN2T32QkEm/qU rD18pvJT8wd7HXemG/AyTg8g6kKOpGsLmIxy/3g4pIDOiQ0zpCPCKwcP6dPROn9yqjVAVcJDH 9bI04O/R0N4HmRpOqNn+dDr5DdtSNNYCitWfksFilRhSRmSlAadDZsCCd7Hl0/rcbQF9IP5aH DhbfyM4rg72PU5f7ZdK7GNiSdt0omDzZ7h0gC0Skiklko2xqTpEmAoto9yY797LueuffY/DYp nweo6Xi18FwQA1Q2Ux9m2I8mtjFqBKt7oKt8N9l+vn+9LMJHswNkZzXR9T5IaO9qvtEweUzGZ TwiqKc0df7ZK8sTBRALVPjiFPK9QUtt2F7SQRh/e7BDpJF5K8BLM5d8nM+wNDj9szfiBLtsPF YUmtsSg021+BUuP/M5pfCXG8qWokZGL+SSY70GT5x/2B8zCgn9zYcFQT0QOBCJnN9ENRiJi3l sNenkCvQC4JWUPquzY2p0eg3k56XyUiIJCQrhtIVkY/1KxuX4FKxmpV3gxa53lTuE6nWAUa+Y EYTyIom+yOEbFHmqlWbysZLJW2h6krD4LTU2M0tSg/xvglJixjl4CiPGYygFaNvNTOXJCzFeq VEIDCoNQ1OLUvMPFW9knpCI9JqHkiGJua6ffNGv8CPykjsgb856VYAXJfg8Wl+rcXEOk1Z3F3 2hrQGyD5mYuv/rjRuYsm8ECuhagsR7EoQxIwz6oZzZOO2i6vTSgQu84apxdSMDlp675bO+Fgr UY/YDwC7zvIbTHJ8EWSrA4wC3AxM= X-Patchwork-Delegate: kuba@kernel.org Fix checkpatch code style warnings: WARNING: please, no space before tabs #230: FILE: net/core/pktgen.c:230: +#define M_NETIF_RECEIVE ^I1^I/* Inject packets into stack */$ Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- Changes v1 -> v2: - change from spaces to tab for indent (suggested by Jakub Kicinski) --- net/core/pktgen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 21206a567843..9d56f9765411 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -227,7 +227,7 @@ static char *pkt_flag_names[] = { /* Xmit modes */ #define M_START_XMIT 0 /* Default normal TX */ -#define M_NETIF_RECEIVE 1 /* Inject packets into stack */ +#define M_NETIF_RECEIVE 1 /* Inject packets into stack */ #define M_QUEUE_XMIT 2 /* Inject packet into qdisc */ /* If lock -- protects updating of if_list */ From patchwork Tue Apr 15 11:29:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 14052061 X-Patchwork-Delegate: kuba@kernel.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5CA629A3EB; Tue, 15 Apr 2025 11:29:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744716585; cv=none; b=cCLb1FuW+ZrvOBjw1kgCMREwgFelD3D4ziMAy9+dmPQ2vTO9Tv+Y5pwQIOHJt3j1tnAAEe58nKVSBYbLcZ67ClFkg1C4ihLT+BeyspOdstiYKFLw6XY+CWZ6z3bHD+uj2OhiY6sEXyg3bIsiufa9ZBemN7NJyRk7hQhMUeFnMEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744716585; c=relaxed/simple; bh=n9qZGXD7GYfsn6JDx2SNkZTrCisSdPpoZAIHfFc7Lmw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EniwN6TYnEA1TA7Oykqa+xFVOhQpZHelw/fqAKT/nB7xaBgBn1zBGh94fopyPxwID/E8hlgD+aCIMngiB+Q87QBVIXqYL1AQe116GGvQgyP4I4lIJKnmACqEbqC0jjK5PgD9q4Nt5qB6sZvX1+g4mAgc9nb19dTGpt0OmOd55Oc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net; spf=pass smtp.mailfrom=gmx.net; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b=qV8Cpw0J; arc=none smtp.client-ip=212.227.15.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="qV8Cpw0J" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1744716570; x=1745321370; i=ps.report@gmx.net; bh=n9qZGXD7GYfsn6JDx2SNkZTrCisSdPpoZAIHfFc7Lmw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=qV8Cpw0JVNfoAkrdVtTkpwHkYtvSgkc+DQRqb8H9YJN6QOivrq7HpJxZknRm02QQ ronKt1dUkNrZWwVBDk6uS5SUJn8zpmp2qd2VX+bzlK02GPXEaPm32DJBr1LK98xoD pu6wozsTuIgaA9sqTHHPmzsXOtV7EPE10+1BubyO29I2RDNRk7NmWqDmcPHgu9SJp 9+PliDvyukOUM6GG17lcnFE+6/ieiV+D88EWXsuT/BuBDzI+Z2IoOh2oyrs64I5n0 avUm/vwp5zLgQOmxQiWIdAYeE7W/cpoVEYpK9ZtfF4eVdH6IlN7WAKAbwyb483PIF Nn/RbdhC8XxwLD48cQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.153]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N9MpS-1szgKM32bE-00uE5K; Tue, 15 Apr 2025 13:29:30 +0200 From: Peter Seiderer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Peter Seiderer Subject: [PATCH net-next v2 3/3] net: pktgen: fix code style (WARNING: Prefer strscpy over strcpy) Date: Tue, 15 Apr 2025 13:29:16 +0200 Message-ID: <20250415112916.113455-4-ps.report@gmx.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415112916.113455-1-ps.report@gmx.net> References: <20250415112916.113455-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:u6y7H1hdnkE2N2yMjXkmXobNOizobzYkBbOaEBQf+tdhN9SRASb Tj8TrjW5B+JnbFHkDE7hPlbUiuKW/quMPiECj5yfq7Z28nJ4qPDOl8Kj58c8Wb89ye0ajgb OtBmyufseb37ZchU0OIchTt5AD3lB2C+d7D62TDQzVAOPAsWn9CYMmZnfTu/Q9hZCMrOWLk u9R5+1w9FaTGXsjNKoCbQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Ac8MjRSmW9M=;JkoAH0XHkJjGs/Q8BmEt4sAjSw8 RJsVe307LfTpgGDcv/ITjW+mBhDZLXXYRxLTnrukG4Y2EXeOKvqtpKnvnfWPu9iTv7gcqXGnW 39ozDtTYGPpR04US0moddphl/VceoHesl3v9GPEh8iu/S8TR2A475md/7edYoowwMdcVkzjgv MOnua6YZDHASqZgvV23UV3Zup01uv5U1mdn0GTLdcykJQWjdK7lDy58xp/JR/1WCGEoPDGgdZ RncRH3DEdXC0oIPazkyxmkpVgrGB8RCLbHt1XBmDJUKRt57COc6HS1vWMEHMUsZwRqNadFqGH dvZbgNUYWmMNTMgL3x9NCVbFxgY1qIr8TRFs+mHmoj56xqtsJHI/kCd7g1I9PBpYvJnxz+PU8 gsgjDgafr/FB1yEoCIdYOGCpqgEkaes2uY1B5uADsLyB/CbfKK/eiL8lM+A1U1yZ+rnVfWTnj hdpFNrRV+KvwK/PQ9YjjeFz4tOHHhQAmX/M5iXGxHNR7ydOLnNwAb7Rs6edSr/APnCvKBg4DX 51BNmk4t5Ozdg+GqUb1YUu3ovWQhli2tLpS0r1OUcmkNsikOMWtro0K+c3FWTwikGQojBkbAx YPhGf079bE0JeUz+CE1L11Lrrqp0bQuUKPRa2F8KwEtqFu5J0L/lrPJSSiGgGD5Bb1O462OAE bONv9rWtgmAz8LjzDPCcWSDB5tEiBVIO903xYY9eGKdndYvPZqtJpa2LjZJGUTzA5e7GEptIS GVszGG7FsSccLE/mFpy54q58Hhuu4CxQZFn6Dw/Akw3116mvaljteuCPVZ8srrZBJdUCpDzRg xLuFB2zMAg7kXqfCaoKrvI93fynEzYQ7x86qzTIpvMPu8GbFmH4IrKDk3/n99JtSzmfM41K1A aMvHlIYi7xVbMd85noGISOI5w61wONI94o3dZTOZQ0LLO7OyEjfEx+Y/YJP4A9aIUSvXtkohI yJMetlLeofWAXKMcvo1NM2HR0SnDRWGLDEVekCSutGblAWykPwBk/fj4EAPsuttEQ8QJOlKjX nzgcVzDYlokVw+0RtTw7d3hAdloBnXovCD9rgRVMU9fNElMRAS/kPpAa/HBWmU3aLQfKMpwk+ j6pCfgLzlmgRGpYvpvzPdehDoTQPR+n5YqnRzIQ1dnEs/Y7M4NiArfmXpo3c1/p4xS2sjYNiD nRXGfzQG1RLwDbSC8wA6o8E9Dp2M8o35I5B7aZbVxntIE4eiMiaMhoWvBTFZuCSS86Cd4kbng zlwUtIWEcL8DCzjMsYNRElejpRt1hiwl35qfqUTh/uqvQe+VeARLAoDPXBVGo26IlYv65huFF z4RMIt9RRc2R1OW4Po/YZYUUwnNWO7gJMz7KqIqnfoo3CG9Y0dqeuT1WODScE05UQis0KDA9e xMf8nkDichbbWxC+h4xYG1hoGWVEGLF7kaLJUXjrvUEXrSwyYtvEtilBfh8M+AjVz76jjwM/P 01xjCtAvF/wjYvdFMiVFFyQu/z4F4oRzwxhmxd25XWbFlptqel37EfJJF5aJC9oVwhLbGbasZ MFj8uUXWTgbIa6Zstq4= X-Patchwork-Delegate: kuba@kernel.org Fix checkpatch code style warnings: WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/issues/88 #1423: FILE: net/core/pktgen.c:1423: + strcpy(pkt_dev->dst_min, buf); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/issues/88 #1444: FILE: net/core/pktgen.c:1444: + strcpy(pkt_dev->dst_max, buf); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/issues/88 #1554: FILE: net/core/pktgen.c:1554: + strcpy(pkt_dev->src_min, buf); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/issues/88 #1575: FILE: net/core/pktgen.c:1575: + strcpy(pkt_dev->src_max, buf); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/issues/88 #3231: FILE: net/core/pktgen.c:3231: + strcpy(pkt_dev->result, "Starting"); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/issues/88 #3235: FILE: net/core/pktgen.c:3235: + strcpy(pkt_dev->result, "Error starting"); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/issues/88 #3849: FILE: net/core/pktgen.c:3849: + strcpy(pkt_dev->odevname, ifname); While at it squash memset/strcpy pattern into single strscpy_pad call. Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- Changes v1 -> v2: - squash memset/strscpy pattern into single strscpy_pad call (suggested by Jakub Kicinski) --- net/core/pktgen.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 9d56f9765411..0ebe5461d4d9 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -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);