Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05947783 authored by Murali Karicheri's avatar Murali Karicheri Committed by David S. Miller
Browse files

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: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fa96778

net/hsr/hsr_forward.c

+4 −4
Original line number Diff line number Diff line
@@ -61,8 +61,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. */
@@ -327,8 +327,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);

net/hsr/hsr_framereg.c

+2 −2
Original line number Diff line number Diff line
@@ -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. */



	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.

		 */