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

Commit 77099f0a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

staging: batman-adv: remove useless addr_to_string() 



Since all *printf() methods in the kernel understand '%pM' modifier the
conversion to the string is useless beforehand.

Additionally this patch decreases batman_if structure by 20 bytes.

Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cd389a34

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

+0 −2
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ static bool hardif_is_iface_up(struct batman_if *batman_if) 


static void update_mac_addresses(struct batman_if *batman_if)

{

	addr_to_string(batman_if->addr_str, batman_if->net_dev->dev_addr);



	memcpy(((struct batman_packet *)(batman_if->packet_buff))->orig,

	       batman_if->net_dev->dev_addr, ETH_ALEN);

	memcpy(((struct batman_packet *)(batman_if->packet_buff))->prev_sender,

drivers/staging/batman-adv/main.c

+0 −5
Original line number Diff line number Diff line
@@ -145,11 +145,6 @@ void dec_module_count(void) 
	module_put(THIS_MODULE);

}



int addr_to_string(char *buff, uint8_t *addr)

{

	return sprintf(buff, "%pM", addr);

}



/* returns 1 if they are the same originator */



int compare_orig(void *data1, void *data2)

drivers/staging/batman-adv/main.h

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 


#define PACKBUFF_SIZE 2000

#define LOG_BUF_LEN 8192	  /* has to be a power of 2 */

#define ETH_STR_LEN 20



#define VIS_INTERVAL 5000	/* 5 seconds */
@@ -136,7 +135,6 @@ int mesh_init(struct net_device *soft_iface); 
void mesh_free(struct net_device *soft_iface);

void inc_module_count(void);

void dec_module_count(void);

int addr_to_string(char *buff, uint8_t *addr);

int compare_orig(void *data1, void *data2);

int choose_orig(void *data, int32_t size);

int is_my_mac(uint8_t *addr);

drivers/staging/batman-adv/originator.c

+6 −10
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) 
	int last_seen_secs;

	int last_seen_msecs;

	unsigned long flags;

	char orig_str[ETH_STR_LEN], router_str[ETH_STR_LEN];



	if ((!bat_priv->primary_if) ||

	    (bat_priv->primary_if->if_status != IF_ACTIVE)) {
@@ -329,10 +328,10 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) 
				  net_dev->name);

	}



	seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)]\n",

	seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n",

		   SOURCE_VERSION, REVISION_VERSION_STR,

		   bat_priv->primary_if->net_dev->name,

		   bat_priv->primary_if->addr_str, net_dev->name);

		   bat_priv->primary_if->net_dev->dev_addr, net_dev->name);

	seq_printf(seq, "  %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",

		   "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop",

		   "outgoingIF", "Potential nexthops");
@@ -349,21 +348,18 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) 
		if (orig_node->router->tq_avg == 0)

			continue;



		addr_to_string(orig_str, orig_node->orig);

		addr_to_string(router_str, orig_node->router->addr);

		last_seen_secs = jiffies_to_msecs(jiffies -

						orig_node->last_valid) / 1000;

		last_seen_msecs = jiffies_to_msecs(jiffies -

						orig_node->last_valid) % 1000;



		seq_printf(seq, "%-17s %4i.%03is   (%3i) %17s [%10s]:",

			   orig_str, last_seen_secs, last_seen_msecs,

			   orig_node->router->tq_avg, router_str,

		seq_printf(seq, "%pM %4i.%03is   (%3i) %pM [%10s]:",

			   orig_node->orig, last_seen_secs, last_seen_msecs,

			   orig_node->router->tq_avg, orig_node->router->addr,

			   orig_node->router->if_incoming->net_dev->name);



		list_for_each_entry(neigh_node, &orig_node->neigh_list, list) {

			addr_to_string(orig_str, neigh_node->addr);

			seq_printf(seq, " %17s (%3i)", orig_str,

			seq_printf(seq, " %pM (%3i)", neigh_node->addr,

					   neigh_node->tq_avg);

		}

drivers/staging/batman-adv/routing.c

+2 −2
Original line number Diff line number Diff line
@@ -554,11 +554,11 @@ void receive_bat_packet(struct ethhdr *ethhdr, 
					    batman_packet->orig) ? 1 : 0);



	bat_dbg(DBG_BATMAN, bat_priv,

		"Received BATMAN packet via NB: %pM, IF: %s [%s] "

		"Received BATMAN packet via NB: %pM, IF: %s [%pM] "

		"(from OG: %pM, via prev OG: %pM, seqno %d, tq %d, "

		"TTL %d, V %d, IDF %d)\n",

		ethhdr->h_source, if_incoming->net_dev->name,

		if_incoming->addr_str, batman_packet->orig,

		if_incoming->net_dev->dev_addr, batman_packet->orig,

		batman_packet->prev_sender, batman_packet->seqno,

		batman_packet->tq, batman_packet->ttl, batman_packet->version,

		has_directlink_flag);