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

net: hsr: fix lines exceeding 80 characters 



This patch fixes lines exceeding 80 characters. This is seen
when ran checkpatch.pl with -f option for files under
net/hsr.

Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f1054c65

net/hsr/hsr_forward.c

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb) 


		hsrSupTag = &hsrV1Hdr->hsr_sup;

	} else {

		hsrSupTag = &((struct hsrv0_ethhdr_sp *) skb_mac_header(skb))->hsr_sup;

		hsrSupTag =

		     &((struct hsrv0_ethhdr_sp *) skb_mac_header(skb))->hsr_sup;

	}



	if ((hsrSupTag->HSR_TLV_Type != HSR_TLV_ANNOUNCE) &&

net/hsr/hsr_framereg.c

+5 −3
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr, 
		if (!node_curr->time_in_stale[i] &&

		    time_after(node_curr->time_in[i], node_real->time_in[i])) {

			node_real->time_in[i] = node_curr->time_in[i];

			node_real->time_in_stale[i] = node_curr->time_in_stale[i];

			node_real->time_in_stale[i] =

						node_curr->time_in_stale[i];

		}

		if (seq_nr_after(node_curr->seq_out[i], node_real->seq_out[i]))

			node_real->seq_out[i] = node_curr->seq_out[i];
@@ -308,7 +309,8 @@ void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb, 
	if (!is_unicast_ether_addr(eth_hdr(skb)->h_dest))

		return;



	node_dst = find_node_by_AddrA(&port->hsr->node_db, eth_hdr(skb)->h_dest);

	node_dst = find_node_by_AddrA(&port->hsr->node_db,

				      eth_hdr(skb)->h_dest);

	if (!node_dst) {

		WARN_ONCE(1, "%s: Unknown node\n", __func__);

		return;

net/hsr/hsr_main.c

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event, 


		if (port->type == HSR_PT_SLAVE_A) {

			ether_addr_copy(master->dev->dev_addr, dev->dev_addr);

			call_netdevice_notifiers(NETDEV_CHANGEADDR, master->dev);

			call_netdevice_notifiers(NETDEV_CHANGEADDR,

						 master->dev);

		}



		/* Make sure we recognize frames from ourselves in hsr_rcv() */

net/hsr/hsr_main.h

+4 −4
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ static inline u16 get_hsr_tag_LSDU_size(struct hsr_tag *ht) 


static inline void set_hsr_tag_path(struct hsr_tag *ht, u16 path)

{

	ht->path_and_LSDU_size = htons(

			(ntohs(ht->path_and_LSDU_size) & 0x0FFF) | (path << 12));

	ht->path_and_LSDU_size =

		htons((ntohs(ht->path_and_LSDU_size) & 0x0FFF) | (path << 12));

}



static inline void set_hsr_tag_LSDU_size(struct hsr_tag *ht, u16 LSDU_size)

net/hsr/hsr_netlink.c

+18 −13
Original line number Diff line number Diff line
@@ -47,12 +47,14 @@ static int hsr_newlink(struct net *src_net, struct net_device *dev, 
		netdev_info(dev, "HSR: Slave1 device not specified\n");

		return -EINVAL;

	}

	link[0] = __dev_get_by_index(src_net, nla_get_u32(data[IFLA_HSR_SLAVE1]));

	link[0] = __dev_get_by_index(src_net,

				     nla_get_u32(data[IFLA_HSR_SLAVE1]));

	if (!data[IFLA_HSR_SLAVE2]) {

		netdev_info(dev, "HSR: Slave2 device not specified\n");

		return -EINVAL;

	}

	link[1] = __dev_get_by_index(src_net, nla_get_u32(data[IFLA_HSR_SLAVE2]));

	link[1] = __dev_get_by_index(src_net,

				     nla_get_u32(data[IFLA_HSR_SLAVE2]));



	if (!link[0] || !link[1])

		return -ENODEV;
@@ -156,7 +158,8 @@ void hsr_nl_ringerror(struct hsr_priv *hsr, unsigned char addr[ETH_ALEN], 
	if (!skb)

		goto fail;



	msg_head = genlmsg_put(skb, 0, 0, &hsr_genl_family, 0, HSR_C_RING_ERROR);

	msg_head = genlmsg_put(skb, 0, 0, &hsr_genl_family, 0,

			       HSR_C_RING_ERROR);

	if (!msg_head)

		goto nla_put_failure;
@@ -289,7 +292,8 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info) 


	hsr = netdev_priv(hsr_dev);

	res = hsr_get_node_data(hsr,

			(unsigned char *) nla_data(info->attrs[HSR_A_NODE_ADDR]),

				(unsigned char *)

				nla_data(info->attrs[HSR_A_NODE_ADDR]),

					 hsr_node_addr_b,

					 &addr_b_ifindex,

					 &hsr_node_if1_age,
@@ -310,7 +314,8 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info) 
		if (res < 0)

			goto nla_put_failure;



		res = nla_put_u32(skb_out, HSR_A_ADDR_B_IFINDEX, addr_b_ifindex);

		res = nla_put_u32(skb_out, HSR_A_ADDR_B_IFINDEX,

				  addr_b_ifindex);

		if (res < 0)

			goto nla_put_failure;

	}