net: hsr: fix placement of logical operator in a multi-line statement

[ 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 <m-karicheri2@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: ddbec99f5857 ("hsr: Fix uninit-value access in hsr_get_node()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index adfb497606785d9b0a62ab105253a1212cad2613..886fad5922b3c0ae17398bbfe745643ceb8ad1fe 100644 (file)
--- 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, struct sk_buff *skb)
                return false;
 
        /* Correct ether type?. */
-       if (!(ethHdr->h_proto == htons(ETH_P_PRP)
-                       || ethHdr->h_proto == htons(ETH_P_HSR)))
+       if (!(ethHdr->h_proto == htons(ETH_P_PRP) ||
+             ethHdr->h_proto == htons(ETH_P_HSR)))
                return false;
 
        /* Get the supervision header from correct location. */
@@ -336,8 +336,8 @@ static int hsr_fill_frame_info(struct hsr_frame_info *frame,
                /* FIXME: */
                WARN_ONCE(1, "HSR: VLAN not yet supported");
        }
-       if (ethhdr->h_proto == htons(ETH_P_PRP)
-                       || ethhdr->h_proto == htons(ETH_P_HSR)) {
+       if (ethhdr->h_proto == htons(ETH_P_PRP) ||
+           ethhdr->h_proto == htons(ETH_P_HSR)) {
                frame->skb_std = NULL;
                frame->skb_hsr = skb;
                frame->sequence_nr = hsr_get_skb_sequence_nr(skb);

diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index 37795502bb5114e92fa36f7d7edf67334aab7e09..9c5a423f0f7a30766048fb2e1a4d5275c8325dc2 100644 (file)
--- 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, struct sk_buff *skb,
 
        /* Everyone may create a node entry, connected node to a HSR device. */
 
-       if (ethhdr->h_proto == htons(ETH_P_PRP)
-                       || ethhdr->h_proto == htons(ETH_P_HSR)) {
+       if (ethhdr->h_proto == htons(ETH_P_PRP) ||
+           ethhdr->h_proto == htons(ETH_P_HSR)) {
                /* Use the existing sequence_nr from the tag as starting point
                 * for filtering duplicate frames.
                 */