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

net: hsr: remove camel case usage in the code 



Current driver code uses camel case in many places. This is
seen when ran checkpatch.pl -f on files under net/hsr. This
patch fixes the code to remove camel case usage.

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

net/hsr/hsr_device.c

+15 −14
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static const struct header_ops hsr_header_ops = { 
};



static void send_hsr_supervision_frame(struct hsr_port *master,

				       u8 type, u8 hsrVer)

				       u8 type, u8 hsr_ver)

{

	struct sk_buff *skb;

	int hlen, tlen;
@@ -264,28 +264,28 @@ static void send_hsr_supervision_frame(struct hsr_port *master, 
	skb_reserve(skb, hlen);



	skb->dev = master->dev;

	skb->protocol = htons(hsrVer ? ETH_P_HSR : ETH_P_PRP);

	skb->protocol = htons(hsr_ver ? ETH_P_HSR : ETH_P_PRP);

	skb->priority = TC_PRIO_CONTROL;



	if (dev_hard_header(skb, skb->dev, (hsrVer ? ETH_P_HSR : ETH_P_PRP),

	if (dev_hard_header(skb, skb->dev, (hsr_ver ? ETH_P_HSR : ETH_P_PRP),

			    master->hsr->sup_multicast_addr,

			    skb->dev->dev_addr, skb->len) <= 0)

		goto out;

	skb_reset_mac_header(skb);



	if (hsrVer > 0) {

	if (hsr_ver > 0) {

		hsr_tag = skb_put(skb, sizeof(struct hsr_tag));

		hsr_tag->encap_proto = htons(ETH_P_PRP);

		set_hsr_tag_LSDU_size(hsr_tag, HSR_V1_SUP_LSDUSIZE);

	}



	hsr_stag = skb_put(skb, sizeof(struct hsr_sup_tag));

	set_hsr_stag_path(hsr_stag, (hsrVer ? 0x0 : 0xf));

	set_hsr_stag_HSR_Ver(hsr_stag, hsrVer);

	set_hsr_stag_path(hsr_stag, (hsr_ver ? 0x0 : 0xf));

	set_hsr_stag_HSR_ver(hsr_stag, hsr_ver);



	/* From HSRv1 on we have separate supervision sequence numbers. */

	spin_lock_irqsave(&master->hsr->seqnr_lock, irqflags);

	if (hsrVer > 0) {

	if (hsr_ver > 0) {

		hsr_stag->sequence_nr = htons(master->hsr->sup_sequence_nr);

		hsr_tag->sequence_nr = htons(master->hsr->sequence_nr);

		master->hsr->sup_sequence_nr++;
@@ -296,13 +296,14 @@ static void send_hsr_supervision_frame(struct hsr_port *master, 
	}

	spin_unlock_irqrestore(&master->hsr->seqnr_lock, irqflags);



	hsr_stag->HSR_TLV_Type = type;

	hsr_stag->HSR_TLV_type = type;

	/* TODO: Why 12 in HSRv0? */

	hsr_stag->HSR_TLV_Length = hsrVer ? sizeof(struct hsr_sup_payload) : 12;

	hsr_stag->HSR_TLV_length =

				hsr_ver ? sizeof(struct hsr_sup_payload) : 12;



	/* Payload: MacAddressA */

	hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload));

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

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



	if (skb_put_padto(skb, ETH_ZLEN + HSR_HLEN))

		return;
@@ -328,15 +329,15 @@ static void hsr_announce(struct timer_list *t) 
	rcu_read_lock();

	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);



	if (hsr->announce_count < 3 && hsr->protVersion == 0) {

	if (hsr->announce_count < 3 && hsr->prot_version == 0) {

		send_hsr_supervision_frame(master, HSR_TLV_ANNOUNCE,

					   hsr->protVersion);

					   hsr->prot_version);

		hsr->announce_count++;



		interval = msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL);

	} else {

		send_hsr_supervision_frame(master, HSR_TLV_LIFE_CHECK,

					   hsr->protVersion);

					   hsr->prot_version);



		interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL);

	}
@@ -455,7 +456,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], 
	ether_addr_copy(hsr->sup_multicast_addr, def_multicast_addr);

	hsr->sup_multicast_addr[ETH_ALEN - 1] = multicast_spec;



	hsr->protVersion = protocol_version;

	hsr->prot_version = protocol_version;



	/* FIXME: should I modify the value of these?

	 *

net/hsr/hsr_forward.c

+19 −19
Original line number Diff line number Diff line
@@ -48,40 +48,40 @@ struct hsr_frame_info { 
 */

static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)

{

	struct ethhdr *ethHdr;

	struct hsr_sup_tag *hsrSupTag;

	struct hsrv1_ethhdr_sp *hsrV1Hdr;

	struct ethhdr *eth_hdr;

	struct hsr_sup_tag *hsr_sup_tag;

	struct hsrv1_ethhdr_sp *hsr_V1_hdr;



	WARN_ON_ONCE(!skb_mac_header_was_set(skb));

	ethHdr = (struct ethhdr *)skb_mac_header(skb);

	eth_hdr = (struct ethhdr *)skb_mac_header(skb);



	/* Correct addr? */

	if (!ether_addr_equal(ethHdr->h_dest,

	if (!ether_addr_equal(eth_hdr->h_dest,

			      hsr->sup_multicast_addr))

		return false;



	/* Correct ether type?. */

	if (!(ethHdr->h_proto == htons(ETH_P_PRP) ||

	      ethHdr->h_proto == htons(ETH_P_HSR)))

	if (!(eth_hdr->h_proto == htons(ETH_P_PRP) ||

	      eth_hdr->h_proto == htons(ETH_P_HSR)))

		return false;



	/* Get the supervision header from correct location. */

	if (ethHdr->h_proto == htons(ETH_P_HSR)) { /* Okay HSRv1. */

		hsrV1Hdr = (struct hsrv1_ethhdr_sp *)skb_mac_header(skb);

		if (hsrV1Hdr->hsr.encap_proto != htons(ETH_P_PRP))

	if (eth_hdr->h_proto == htons(ETH_P_HSR)) { /* Okay HSRv1. */

		hsr_V1_hdr = (struct hsrv1_ethhdr_sp *)skb_mac_header(skb);

		if (hsr_V1_hdr->hsr.encap_proto != htons(ETH_P_PRP))

			return false;



		hsrSupTag = &hsrV1Hdr->hsr_sup;

		hsr_sup_tag = &hsr_V1_hdr->hsr_sup;

	} else {

		hsrSupTag =

		hsr_sup_tag =

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

	}



	if (hsrSupTag->HSR_TLV_Type != HSR_TLV_ANNOUNCE &&

	    hsrSupTag->HSR_TLV_Type != HSR_TLV_LIFE_CHECK)

	if (hsr_sup_tag->HSR_TLV_type != HSR_TLV_ANNOUNCE &&

	    hsr_sup_tag->HSR_TLV_type != HSR_TLV_LIFE_CHECK)

		return false;

	if (hsrSupTag->HSR_TLV_Length != 12 &&

	    hsrSupTag->HSR_TLV_Length != sizeof(struct hsr_sup_payload))

	if (hsr_sup_tag->HSR_TLV_length != 12 &&

	    hsr_sup_tag->HSR_TLV_length != sizeof(struct hsr_sup_payload))

		return false;



	return true;
@@ -125,7 +125,7 @@ static struct sk_buff *frame_get_stripped_skb(struct hsr_frame_info *frame, 
}



static void hsr_fill_tag(struct sk_buff *skb, struct hsr_frame_info *frame,

			 struct hsr_port *port, u8 protoVersion)

			 struct hsr_port *port, u8 proto_version)

{

	struct hsr_ethhdr *hsr_ethhdr;

	int lane_id;
@@ -146,7 +146,7 @@ static void hsr_fill_tag(struct sk_buff *skb, struct hsr_frame_info *frame, 
	set_hsr_tag_LSDU_size(&hsr_ethhdr->hsr_tag, lsdu_size);

	hsr_ethhdr->hsr_tag.sequence_nr = htons(frame->sequence_nr);

	hsr_ethhdr->hsr_tag.encap_proto = hsr_ethhdr->ethhdr.h_proto;

	hsr_ethhdr->ethhdr.h_proto = htons(protoVersion ?

	hsr_ethhdr->ethhdr.h_proto = htons(proto_version ?

			ETH_P_HSR : ETH_P_PRP);

}
@@ -176,7 +176,7 @@ static struct sk_buff *create_tagged_skb(struct sk_buff *skb_o, 
	memmove(dst, src, movelen);

	skb_reset_mac_header(skb);



	hsr_fill_tag(skb, frame, port, port->hsr->protVersion);

	hsr_fill_tag(skb, frame, port, port->hsr->prot_version);



	return skb;

}

net/hsr/hsr_framereg.c

+35 −35
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 


struct hsr_node {

	struct list_head	mac_list;

	unsigned char		MacAddressA[ETH_ALEN];

	unsigned char		MacAddressB[ETH_ALEN];

	unsigned char		macaddress_A[ETH_ALEN];

	unsigned char		macaddress_B[ETH_ALEN];

	/* Local slave through which AddrB frames are received from this node */

	enum hsr_port_type	AddrB_port;

	enum hsr_port_type	addr_B_port;

	unsigned long		time_in[HSR_PT_PORTS];

	bool			time_in_stale[HSR_PT_PORTS];

	u16			seq_out[HSR_PT_PORTS];
@@ -64,9 +64,9 @@ bool hsr_addr_is_self(struct hsr_priv *hsr, unsigned char *addr) 
		return false;

	}



	if (ether_addr_equal(addr, node->MacAddressA))

	if (ether_addr_equal(addr, node->macaddress_A))

		return true;

	if (ether_addr_equal(addr, node->MacAddressB))

	if (ether_addr_equal(addr, node->macaddress_B))

		return true;



	return false;
@@ -74,13 +74,13 @@ bool hsr_addr_is_self(struct hsr_priv *hsr, unsigned char *addr) 


/* Search for mac entry. Caller must hold rcu read lock.

 */

static struct hsr_node *find_node_by_AddrA(struct list_head *node_db,

static struct hsr_node *find_node_by_addr_A(struct list_head *node_db,

					    const unsigned char addr[ETH_ALEN])

{

	struct hsr_node *node;



	list_for_each_entry_rcu(node, node_db, mac_list) {

		if (ether_addr_equal(node->MacAddressA, addr))

		if (ether_addr_equal(node->macaddress_A, addr))

			return node;

	}
@@ -100,8 +100,8 @@ int hsr_create_self_node(struct list_head *self_node_db, 
	if (!node)

		return -ENOMEM;



	ether_addr_copy(node->MacAddressA, addr_a);

	ether_addr_copy(node->MacAddressB, addr_b);

	ether_addr_copy(node->macaddress_A, addr_a);

	ether_addr_copy(node->macaddress_B, addr_b);



	rcu_read_lock();

	oldnode = list_first_or_null_rcu(self_node_db,
@@ -132,7 +132,7 @@ void hsr_del_node(struct list_head *self_node_db) 
	}

}



/* Allocate an hsr_node and add it to node_db. 'addr' is the node's AddressA;

/* Allocate an hsr_node and add it to node_db. 'addr' is the node's address_A;

 * seq_out is used to initialize filtering of outgoing duplicate frames

 * originating from the newly added node.

 */
@@ -147,7 +147,7 @@ struct hsr_node *hsr_add_node(struct list_head *node_db, unsigned char addr[], 
	if (!node)

		return NULL;



	ether_addr_copy(node->MacAddressA, addr);

	ether_addr_copy(node->macaddress_A, addr);



	/* We are only interested in time diffs here, so use current jiffies

	 * as initialization. (0 could trigger an spurious ring error warning).
@@ -179,9 +179,9 @@ struct hsr_node *hsr_get_node(struct hsr_port *port, struct sk_buff *skb, 
	ethhdr = (struct ethhdr *)skb_mac_header(skb);



	list_for_each_entry_rcu(node, node_db, mac_list) {

		if (ether_addr_equal(node->MacAddressA, ethhdr->h_source))

		if (ether_addr_equal(node->macaddress_A, ethhdr->h_source))

			return node;

		if (ether_addr_equal(node->MacAddressB, ethhdr->h_source))

		if (ether_addr_equal(node->macaddress_B, ethhdr->h_source))

			return node;

	}
@@ -205,8 +205,8 @@ struct hsr_node *hsr_get_node(struct hsr_port *port, struct sk_buff *skb, 
	return hsr_add_node(node_db, ethhdr->h_source, seq_out);

}



/* Use the Supervision frame's info about an eventual MacAddressB for merging

 * nodes that has previously had their MacAddressB registered as a separate

/* Use the Supervision frame's info about an eventual macaddress_B for merging

 * nodes that has previously had their macaddress_B registered as a separate

 * node.

 */

void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr,
@@ -232,12 +232,12 @@ void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr, 


	hsr_sp = (struct hsr_sup_payload *)skb->data;



	/* Merge node_curr (registered on MacAddressB) into node_real */

	/* Merge node_curr (registered on macaddress_B) into node_real */

	node_db = &port_rcv->hsr->node_db;

	node_real = find_node_by_AddrA(node_db, hsr_sp->MacAddressA);

	node_real = find_node_by_addr_A(node_db, hsr_sp->macaddress_A);

	if (!node_real)

		/* No frame received from AddrA of this node yet */

		node_real = hsr_add_node(node_db, hsr_sp->MacAddressA,

		node_real = hsr_add_node(node_db, hsr_sp->macaddress_A,

					 HSR_SEQNR_START - 1);

	if (!node_real)

		goto done; /* No mem */
@@ -245,7 +245,7 @@ void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr, 
		/* Node has already been merged */

		goto done;



	ether_addr_copy(node_real->MacAddressB, ethhdr->h_source);

	ether_addr_copy(node_real->macaddress_B, ethhdr->h_source);

	for (i = 0; i < HSR_PT_PORTS; i++) {

		if (!node_curr->time_in_stale[i] &&

		    time_after(node_curr->time_in[i], node_real->time_in[i])) {
@@ -256,7 +256,7 @@ void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr, 
		if (seq_nr_after(node_curr->seq_out[i], node_real->seq_out[i]))

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

	}

	node_real->AddrB_port = port_rcv->type;

	node_real->addr_B_port = port_rcv->type;



	list_del_rcu(&node_curr->mac_list);

	kfree_rcu(node_curr, rcu_head);
@@ -268,7 +268,7 @@ done: 
/* 'skb' is a frame meant for this host, that is to be passed to upper layers.

 *

 * If the frame was sent by a node's B interface, replace the source

 * address with that node's "official" address (MacAddressA) so that upper

 * address with that node's "official" address (macaddress_A) so that upper

 * layers recognize where it came from.

 */

void hsr_addr_subst_source(struct hsr_node *node, struct sk_buff *skb)
@@ -278,7 +278,7 @@ void hsr_addr_subst_source(struct hsr_node *node, struct sk_buff *skb) 
		return;

	}



	memcpy(&eth_hdr(skb)->h_source, node->MacAddressA, ETH_ALEN);

	memcpy(&eth_hdr(skb)->h_source, node->macaddress_A, ETH_ALEN);

}



/* 'skb' is a frame meant for another host.
@@ -303,16 +303,16 @@ 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,

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

				       eth_hdr(skb)->h_dest);

	if (!node_dst) {

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

		return;

	}

	if (port->type != node_dst->AddrB_port)

	if (port->type != node_dst->addr_B_port)

		return;



	ether_addr_copy(eth_hdr(skb)->h_dest, node_dst->MacAddressB);

	ether_addr_copy(eth_hdr(skb)->h_dest, node_dst->macaddress_B);

}



void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,
@@ -406,14 +406,14 @@ void hsr_prune_nodes(struct timer_list *t) 
			rcu_read_lock();

			port = get_late_port(hsr, node);

			if (port)

				hsr_nl_ringerror(hsr, node->MacAddressA, port);

				hsr_nl_ringerror(hsr, node->macaddress_A, port);

			rcu_read_unlock();

		}



		/* Prune old entries */

		if (time_is_before_jiffies(timestamp +

				msecs_to_jiffies(HSR_NODE_FORGET_TIME))) {

			hsr_nl_nodedown(hsr, node->MacAddressA);

			hsr_nl_nodedown(hsr, node->macaddress_A);

			list_del_rcu(&node->mac_list);

			/* Note that we need to free this entry later: */

			kfree_rcu(node, rcu_head);
@@ -431,13 +431,13 @@ void *hsr_get_next_node(struct hsr_priv *hsr, void *_pos, 
		node = list_first_or_null_rcu(&hsr->node_db,

					      struct hsr_node, mac_list);

		if (node)

			ether_addr_copy(addr, node->MacAddressA);

			ether_addr_copy(addr, node->macaddress_A);

		return node;

	}



	node = _pos;

	list_for_each_entry_continue_rcu(node, &hsr->node_db, mac_list) {

		ether_addr_copy(addr, node->MacAddressA);

		ether_addr_copy(addr, node->macaddress_A);

		return node;

	}
@@ -458,13 +458,13 @@ int hsr_get_node_data(struct hsr_priv *hsr, 
	unsigned long tdiff;



	rcu_read_lock();

	node = find_node_by_AddrA(&hsr->node_db, addr);

	node = find_node_by_addr_A(&hsr->node_db, addr);

	if (!node) {

		rcu_read_unlock();

		return -ENOENT;	/* No such entry */

	}



	ether_addr_copy(addr_b, node->MacAddressB);

	ether_addr_copy(addr_b, node->macaddress_B);



	tdiff = jiffies - node->time_in[HSR_PT_SLAVE_A];

	if (node->time_in_stale[HSR_PT_SLAVE_A])
@@ -490,8 +490,8 @@ int hsr_get_node_data(struct hsr_priv *hsr, 
	*if1_seq = node->seq_out[HSR_PT_SLAVE_B];

	*if2_seq = node->seq_out[HSR_PT_SLAVE_A];



	if (node->AddrB_port != HSR_PT_NONE) {

		port = hsr_port_get_hsr(hsr, node->AddrB_port);

	if (node->addr_B_port != HSR_PT_NONE) {

		port = hsr_port_get_hsr(hsr, node->addr_B_port);

		*addr_b_ifindex = port->dev->ifindex;

	} else {

		*addr_b_ifindex = -1;

net/hsr/hsr_main.h

+7 −7
Original line number Diff line number Diff line
@@ -97,14 +97,14 @@ struct hsr_ethhdr { 
 * Field names as defined in the IEC:2010 standard for HSR.

 */

struct hsr_sup_tag {

	__be16		path_and_HSR_Ver;

	__be16		path_and_HSR_ver;

	__be16		sequence_nr;

	__u8		HSR_TLV_Type;

	__u8		HSR_TLV_Length;

	__u8		HSR_TLV_type;

	__u8		HSR_TLV_length;

} __packed;



struct hsr_sup_payload {

	unsigned char	MacAddressA[ETH_ALEN];

	unsigned char	macaddress_A[ETH_ALEN];

} __packed;



static inline u16 get_hsr_stag_path(struct hsr_sup_tag *hst)
@@ -122,9 +122,9 @@ static inline void set_hsr_stag_path(struct hsr_sup_tag *hst, u16 path) 
	set_hsr_tag_path((struct hsr_tag *)hst, path);

}



static inline void set_hsr_stag_HSR_Ver(struct hsr_sup_tag *hst, u16 HSR_Ver)

static inline void set_hsr_stag_HSR_ver(struct hsr_sup_tag *hst, u16 HSR_ver)

{

	set_hsr_tag_LSDU_size((struct hsr_tag *)hst, HSR_Ver);

	set_hsr_tag_LSDU_size((struct hsr_tag *)hst, HSR_ver);

}



struct hsrv0_ethhdr_sp {
@@ -164,7 +164,7 @@ struct hsr_priv { 
	int announce_count;

	u16 sequence_nr;

	u16 sup_sequence_nr;	/* For HSRv1 separate seq_nr for supervision */

	u8 protVersion;		/* Indicate if HSRv0 or HSRv1. */

	u8 prot_version;		/* Indicate if HSRv0 or HSRv1. */

	spinlock_t seqnr_lock;			/* locking for sequence_nr */

	unsigned char		sup_multicast_addr[ETH_ALEN];

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE