batman-adv: Convert names from Java to C style
Useless but meaningfull patch that converts JavaStyle names into c_style
Signed-off-by Antonio Quartulli <[email protected]>
---
vis.c +6 -6
@@ -391,7 +391,7 @@/* Make it a broadcast packet, if required */ if (make_broadcast) -memcpy (info->packet.target_orig, broadcastAddr,ETH_ALEN ); +memcpy (info->packet.target_orig, broadcast_addr,ETH_ALEN );/* repair if entries is longer than packet. */ if (info->packet.entries *sizeof (struct vis_info_entry ) > vis_info_len)
@@ -525,7 +525,7 @@ info->packet.vis_type =atomic_read (&bat_priv->vis_mode);spin_lock_irqsave (&orig_hash_lock, flags); -memcpy (info->packet.target_orig, broadcastAddr,ETH_ALEN ); +memcpy (info->packet.target_orig, broadcast_addr,ETH_ALEN ); info->packet.ttl =TTL ; info->packet.seqno =htonl (ntohl (info->packet.seqno) +1 ); info->packet.entries =0 ;
@@ -642,7 +642,7 @@ }spin_unlock_irqrestore (&orig_hash_lock, flags); -memcpy (info->packet.target_orig, broadcastAddr,ETH_ALEN ); +memcpy (info->packet.target_orig, broadcast_addr,ETH_ALEN ); }static void unicast_vis_packet (struct vis_info *info,int packet_length)
@@ -683,7 +683,7 @@return ; } -memcpy (info->packet.sender_orig, mainIfAddr,ETH_ALEN ); +memcpy (info->packet.sender_orig, main_if_addr,ETH_ALEN ); info->packet.ttl--; packet_length = sizeof(struct vis_packet) +
@@ -764,8 +764,8 @@INIT_LIST_HEAD (&send_list); -memcpy (my_vis_info->packet.vis_orig, mainIfAddr,ETH_ALEN ); -memcpy (my_vis_info->packet.sender_orig, mainIfAddr,ETH_ALEN ); +memcpy (my_vis_info->packet.vis_orig, main_if_addr,ETH_ALEN ); +memcpy (my_vis_info->packet.sender_orig, main_if_addr,ETH_ALEN );if (hash_add (vis_hash, my_vis_info) <0 ) { printk(KERN_ERR
send.c +3 -3
@@ -176,7 +176,7 @@send_raw_packet (forw_packet->packet_buff, forw_packet->packet_len, - batman_if, broadcastAddr); + batman_if, broadcast_addr); }/* send a batman packet */
@@ -213,7 +213,7 @@send_raw_packet (forw_packet->packet_buff, forw_packet->packet_len, forw_packet->if_incoming, - broadcastAddr); + broadcast_addr);return ; }
@@ -476,7 +476,7 @@ skb1 =skb_copy (forw_packet->skb,GFP_ATOMIC );if (skb1)send_skb_packet (skb1, - batman_if, broadcastAddr); + batman_if, broadcast_addr); }rcu_read_unlock ();
soft-interface.c +3 -3
@@ -38,7 +38,7 @@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);
@@ -60,7 +60,7 @@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)
@@ -172,7 +172,7 @@/* 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);
soft-interface.h +1 -1
@@ -25,4 +25,4 @@void interface_rx (struct sk_buff *skb,int hdr_size);int my_skb_push (struct sk_buff *skb,unsigned int len); -extern unsigned char mainIfAddr[]; +extern unsigned char main_if_addr[];
main.c +1 -1
@@ -48,7 +48,7 @@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 = {
routing.c +3 -3
@@ -122,7 +122,7 @@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)
@@ -578,7 +578,7 @@ 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 ; }
@@ -688,7 +688,7 @@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
main.h +1 -1
@@ -146,7 +146,7 @@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;
Quoted 1 line · On Saturday 19 June 2010 11:42:53 Antonio Quartulli wrote:
batman-adv: Convert names from Java to C style
I applied it in revision 1709.
Please send the patch inline instead of an attachment next time.
Thanks,
Marek