Commit 6e0e9388 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Greg Kroah-Hartman
Browse files

Staging: batman-adv: Convert names from Java to C style 



Useless but meaningfull patch that converts JavaStyle names into c_style

Signed-off-by: default avatarAntonio Quartulli <ordex@ritirata.org>
Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 12513b76

drivers/staging/batman-adv/main.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ int16_t num_hna; 


struct net_device *soft_device;



unsigned char broadcastAddr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

atomic_t module_state;



static struct packet_type batman_adv_packet_type __read_mostly = {

drivers/staging/batman-adv/main.h

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ extern int16_t num_hna; 


extern struct net_device *soft_device;



extern unsigned char broadcastAddr[];

extern unsigned char broadcast_addr[];

extern atomic_t module_state;

extern struct workqueue_struct *bat_event_workqueue;

drivers/staging/batman-adv/routing.c

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ void update_routes(struct orig_node *orig_node, 
		update_HNA(orig_node, hna_buff, hna_buff_len);

}



static int isBidirectionalNeigh(struct orig_node *orig_node,

static int is_bidirectional_neigh(struct orig_node *orig_node,

				struct orig_node *orig_neigh_node,

				struct batman_packet *batman_packet,

				struct batman_if *if_incoming)
@@ -564,7 +564,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, 
				 batman_if->net_dev->dev_addr))

			is_my_oldorig = 1;



		if (compare_orig(ethhdr->h_source, broadcastAddr))

		if (compare_orig(ethhdr->h_source, broadcast_addr))

			is_broadcast = 1;

	}
@@ -674,7 +674,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, 
		return;

	}



	is_bidirectional = isBidirectionalNeigh(orig_node, orig_neigh_node,

	is_bidirectional = is_bidirectional_neigh(orig_node, orig_neigh_node,

						batman_packet, if_incoming);



	/* update ranking if it is not a duplicate or has the same

drivers/staging/batman-adv/send.c

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static void send_packet_to_if(struct forw_packet *forw_packet, 


	send_raw_packet(forw_packet->packet_buff,

			forw_packet->packet_len,

			batman_if, broadcastAddr);

			batman_if, broadcast_addr);

}



/* send a batman packet */
@@ -211,7 +211,7 @@ static void send_packet(struct forw_packet *forw_packet) 
		send_raw_packet(forw_packet->packet_buff,

				forw_packet->packet_len,

				forw_packet->if_incoming,

				broadcastAddr);

				broadcast_addr);

		return;

	}
@@ -464,7 +464,7 @@ static void send_outstanding_bcast_packet(struct work_struct *work) 
		skb1 = skb_copy(forw_packet->skb, GFP_ATOMIC);

		if (skb1)

			send_skb_packet(skb1,

				batman_if, broadcastAddr);

				batman_if, broadcast_addr);

	}

	rcu_read_unlock();

drivers/staging/batman-adv/soft-interface.c

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static uint32_t bcast_seqno = 1; /* give own bcast messages seq numbers to avoid 
static int32_t skb_packets;

static int32_t skb_bad_packets;



unsigned char mainIfAddr[ETH_ALEN];

unsigned char main_if_addr[ETH_ALEN];

static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);

static void bat_get_drvinfo(struct net_device *dev,

			    struct ethtool_drvinfo *info);
@@ -58,7 +58,7 @@ static const struct ethtool_ops bat_ethtool_ops = { 


void set_main_if_addr(uint8_t *addr)

{

	memcpy(mainIfAddr, addr, ETH_ALEN);

	memcpy(main_if_addr, addr, ETH_ALEN);

}



int my_skb_push(struct sk_buff *skb, unsigned int len)
@@ -164,7 +164,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev) 


		/* hw address of first interface is the orig mac because only

		 * this mac is known throughout the mesh */

		memcpy(bcast_packet->orig, mainIfAddr, ETH_ALEN);

		memcpy(bcast_packet->orig, main_if_addr, ETH_ALEN);



		/* set broadcast sequence number */

		bcast_packet->seqno = htonl(bcast_seqno);