Commit 516c9a77 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

Staging: batman-adv: Convert MAC_FMT to %pM

Remove the last uses of MAC_FMT
Signed-off-by: default avatarJoe Perches <joe@perches.com>
[sven.eckelmann@gmx.de: Adapted for current batman-adv version]
Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1bcb164e
...@@ -230,8 +230,7 @@ void dec_module_count(void) ...@@ -230,8 +230,7 @@ void dec_module_count(void)
int addr_to_string(char *buff, uint8_t *addr) int addr_to_string(char *buff, uint8_t *addr)
{ {
return sprintf(buff, MAC_FMT, return sprintf(buff, "%pM", addr);
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
} }
/* returns 1 if they are the same originator */ /* returns 1 if they are the same originator */
......
...@@ -199,13 +199,8 @@ int hna_local_seq_print_text(struct seq_file *seq, void *offset) ...@@ -199,13 +199,8 @@ int hna_local_seq_print_text(struct seq_file *seq, void *offset)
while (hash_iterate(hna_local_hash, &hashit)) { while (hash_iterate(hna_local_hash, &hashit)) {
hna_local_entry = hashit.bucket->data; hna_local_entry = hashit.bucket->data;
pos += snprintf(buff + pos, 22, " * " MAC_FMT "\n", pos += snprintf(buff + pos, 22, " * %pM\n",
hna_local_entry->addr[0], hna_local_entry->addr);
hna_local_entry->addr[1],
hna_local_entry->addr[2],
hna_local_entry->addr[3],
hna_local_entry->addr[4],
hna_local_entry->addr[5]);
} }
spin_unlock_irqrestore(&hna_local_hash_lock, flags); spin_unlock_irqrestore(&hna_local_hash_lock, flags);
...@@ -417,19 +412,8 @@ int hna_global_seq_print_text(struct seq_file *seq, void *offset) ...@@ -417,19 +412,8 @@ int hna_global_seq_print_text(struct seq_file *seq, void *offset)
hna_global_entry = hashit.bucket->data; hna_global_entry = hashit.bucket->data;
pos += snprintf(buff + pos, 44, pos += snprintf(buff + pos, 44,
" * " MAC_FMT " via " MAC_FMT "\n", " * %pM via %pM\n", hna_global_entry->addr,
hna_global_entry->addr[0], hna_global_entry->orig_node->orig);
hna_global_entry->addr[1],
hna_global_entry->addr[2],
hna_global_entry->addr[3],
hna_global_entry->addr[4],
hna_global_entry->addr[5],
hna_global_entry->orig_node->orig[0],
hna_global_entry->orig_node->orig[1],
hna_global_entry->orig_node->orig[2],
hna_global_entry->orig_node->orig[3],
hna_global_entry->orig_node->orig[4],
hna_global_entry->orig_node->orig[5]);
} }
spin_unlock_irqrestore(&hna_global_hash_lock, flags); spin_unlock_irqrestore(&hna_global_hash_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment