From nobody Fri Dec 19 20:12:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9089822F510; Sun, 24 Mar 2024 23:52:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324376; cv=none; b=Bvd7tWXlFcAm7fkOD0RBNj4j7/Ddgr74fhpbTtg5HjRrLSuzLMqyieOJQlEZQ7jY0cGs9WZ5tKOgG8mEwizaCGkBYXhNkTWzf9+TzyzfuHJcIkB+YHEtbVRAWyqnLxmF2OOEcNaP+riEy3PfUEhTQtoJl3nVRsyP1x0skjh5FDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324376; c=relaxed/simple; bh=tCYwIpLCrAOSE6XXUPJqeVGUo8QLA62vXiD5B6NkFHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C7jKxCb5UFjnk/b8e4EHnEn7Ml0CyBsP8+pyHM+0FeIyXTWMhLOrnTlLWY87xDlD+hjncPXjqQIQOs3wD4ZynY2Or0MNS34WAIv0Cemi7jgxjTJew8xmsI4ncY9LNqBvY4vl7P9U3/TWD7Cx5ZD4U5qQXH1A3jLh95/ZdOT6HQU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BRahk9yG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BRahk9yG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEAB8C433C7; Sun, 24 Mar 2024 23:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324376; bh=tCYwIpLCrAOSE6XXUPJqeVGUo8QLA62vXiD5B6NkFHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BRahk9yG5soAKJUdIV8iKjBMgnNJz02zUHfjob7dnqTgAKIEwBM5qQ5r3ssUUm2wp 2dWJa5IZrl69YQwEyCNJK2XhId+i8odp7rre9uT7OR03FRpbbXlMxFZuW+SsCeu9rj ijWhX0n3ayGn4APAU/WF4JlPc6lI3P0Ffn49/2RPAfE0/meCl1sh0a0TpGbtF7V6FP e/hoFvqO8W+eXJzfNBxzv6ORv0kKHVQGRdyxqfqzYq2kjytaWsR7ABm/WjFRzSZWwa 6C0qMyTWGEtb+BBKab2OdllyvP4kGqRyWQjmAhOi/SfqNNsByUaquStyn8X2cFS0i4 OH+esdxTOYpZg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Murali Karicheri , "David S . Miller" , Sasha Levin Subject: [PATCH 4.19 142/148] net: hsr: fix placement of logical operator in a multi-line statement Date: Sun, 24 Mar 2024 19:50:06 -0400 Message-ID: <20240324235012.1356413-143-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324235012.1356413-1-sashal@kernel.org> References: <20240324235012.1356413-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Murali Karicheri [ Upstream commit 059477830022e1886f55a9641702461c249fa864 ] In a multi-line statement exceeding 80 characters, logical operator should be at the end of a line instead of being at the start. This is seen when ran checkpatch.pl -f on files under net/hsr. The change is per suggestion from checkpatch. Signed-off-by: Murali Karicheri Signed-off-by: David S. Miller Stable-dep-of: ddbec99f5857 ("hsr: Fix uninit-value access in hsr_get_node(= )") Signed-off-by: Sasha Levin --- net/hsr/hsr_forward.c | 8 ++++---- net/hsr/hsr_framereg.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c index adfb497606785..886fad5922b3c 100644 --- a/net/hsr/hsr_forward.c +++ b/net/hsr/hsr_forward.c @@ -63,8 +63,8 @@ static bool is_supervision_frame(struct hsr_priv *hsr, st= ruct sk_buff *skb) return false; =20 /* Correct ether type?. */ - if (!(ethHdr->h_proto =3D=3D htons(ETH_P_PRP) - || ethHdr->h_proto =3D=3D htons(ETH_P_HSR))) + if (!(ethHdr->h_proto =3D=3D htons(ETH_P_PRP) || + ethHdr->h_proto =3D=3D htons(ETH_P_HSR))) return false; =20 /* Get the supervision header from correct location. */ @@ -336,8 +336,8 @@ static int hsr_fill_frame_info(struct hsr_frame_info *f= rame, /* FIXME: */ WARN_ONCE(1, "HSR: VLAN not yet supported"); } - if (ethhdr->h_proto =3D=3D htons(ETH_P_PRP) - || ethhdr->h_proto =3D=3D htons(ETH_P_HSR)) { + if (ethhdr->h_proto =3D=3D htons(ETH_P_PRP) || + ethhdr->h_proto =3D=3D htons(ETH_P_HSR)) { frame->skb_std =3D NULL; frame->skb_hsr =3D skb; frame->sequence_nr =3D hsr_get_skb_sequence_nr(skb); diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 37795502bb511..9c5a423f0f7a3 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -192,8 +192,8 @@ struct hsr_node *hsr_get_node(struct hsr_port *port, st= ruct sk_buff *skb, =20 /* Everyone may create a node entry, connected node to a HSR device. */ =20 - if (ethhdr->h_proto =3D=3D htons(ETH_P_PRP) - || ethhdr->h_proto =3D=3D htons(ETH_P_HSR)) { + if (ethhdr->h_proto =3D=3D htons(ETH_P_PRP) || + ethhdr->h_proto =3D=3D htons(ETH_P_HSR)) { /* Use the existing sequence_nr from the tag as starting point * for filtering duplicate frames. */ --=20 2.43.0