diff options
author | Murali Karicheri <m-karicheri2@ti.com> | 2019-04-05 13:31:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-06 21:32:21 -0400 |
commit | 059477830022e1886f55a9641702461c249fa864 (patch) | |
tree | fa5f7b1b6665aae2054e2624f178b0741582de7d /net/hsr/hsr_forward.c | |
parent | 5fa9677803643f96f8eb76d2aff7966b26078187 (diff) |
net: hsr: fix placement of logical operator in a multi-line statement
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>
Diffstat (limited to 'net/hsr/hsr_forward.c')
-rw-r--r-- | net/hsr/hsr_forward.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c index 71ffbfd6d740..c4dfc2966f62 100644 --- a/net/hsr/hsr_forward.c +++ b/net/hsr/hsr_forward.c | |||
@@ -61,8 +61,8 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb) | |||
61 | return false; | 61 | return false; |
62 | 62 | ||
63 | /* Correct ether type?. */ | 63 | /* Correct ether type?. */ |
64 | if (!(ethHdr->h_proto == htons(ETH_P_PRP) | 64 | if (!(ethHdr->h_proto == htons(ETH_P_PRP) || |
65 | || ethHdr->h_proto == htons(ETH_P_HSR))) | 65 | ethHdr->h_proto == htons(ETH_P_HSR))) |
66 | return false; | 66 | return false; |
67 | 67 | ||
68 | /* Get the supervision header from correct location. */ | 68 | /* Get the supervision header from correct location. */ |
@@ -327,8 +327,8 @@ static int hsr_fill_frame_info(struct hsr_frame_info *frame, | |||
327 | /* FIXME: */ | 327 | /* FIXME: */ |
328 | WARN_ONCE(1, "HSR: VLAN not yet supported"); | 328 | WARN_ONCE(1, "HSR: VLAN not yet supported"); |
329 | } | 329 | } |
330 | if (ethhdr->h_proto == htons(ETH_P_PRP) | 330 | if (ethhdr->h_proto == htons(ETH_P_PRP) || |
331 | || ethhdr->h_proto == htons(ETH_P_HSR)) { | 331 | ethhdr->h_proto == htons(ETH_P_HSR)) { |
332 | frame->skb_std = NULL; | 332 | frame->skb_std = NULL; |
333 | frame->skb_hsr = skb; | 333 | frame->skb_hsr = skb; |
334 | frame->sequence_nr = hsr_get_skb_sequence_nr(skb); | 334 | frame->sequence_nr = hsr_get_skb_sequence_nr(skb); |