UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Murali Karicheri 2019-04-05 13:31:30 -04:00 committed by David S. Miller
parent 5fa9677803
commit 0594778300
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/hsr/hsr_forward.c
View File

@ -61,8 +61,8 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)
return false; return false;
/* Correct ether type?. */ /* Correct ether type?. */
if (!(ethHdr->h_proto == htons(ETH_P_PRP) if (!(ethHdr->h_proto == htons(ETH_P_PRP) ||
|| ethHdr->h_proto == htons(ETH_P_HSR))) ethHdr->h_proto == htons(ETH_P_HSR)))
return false; return false;
/* Get the supervision header from correct location. */ /* Get the supervision header from correct location. */
@ -327,8 +327,8 @@ static int hsr_fill_frame_info(struct hsr_frame_info *frame,
/* FIXME: */ /* FIXME: */
WARN_ONCE(1, "HSR: VLAN not yet supported"); WARN_ONCE(1, "HSR: VLAN not yet supported");
} }
if (ethhdr->h_proto == htons(ETH_P_PRP) if (ethhdr->h_proto == htons(ETH_P_PRP) ||
|| ethhdr->h_proto == htons(ETH_P_HSR)) { ethhdr->h_proto == htons(ETH_P_HSR)) {
frame->skb_std = NULL; frame->skb_std = NULL;
frame->skb_hsr = skb; frame->skb_hsr = skb;
frame->sequence_nr = hsr_get_skb_sequence_nr(skb); frame->sequence_nr = hsr_get_skb_sequence_nr(skb);

4
net/hsr/hsr_framereg.c
View File

@ -187,8 +187,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. */ /* Everyone may create a node entry, connected node to a HSR device. */
if (ethhdr->h_proto == htons(ETH_P_PRP) if (ethhdr->h_proto == htons(ETH_P_PRP) ||
|| ethhdr->h_proto == htons(ETH_P_HSR)) { ethhdr->h_proto == htons(ETH_P_HSR)) {
/* Use the existing sequence_nr from the tag as starting point /* Use the existing sequence_nr from the tag as starting point
* for filtering duplicate frames. * for filtering duplicate frames.
*/ */