diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/eth_media.c | 3 | ||||
-rw-r--r-- | net/tipc/name_table.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index fe43ef7dd7e3..f72ba774c246 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c | |||
@@ -243,12 +243,11 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt, | |||
243 | static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size) | 243 | static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size) |
244 | { | 244 | { |
245 | unchar *addr = (unchar *)&a->dev_addr; | 245 | unchar *addr = (unchar *)&a->dev_addr; |
246 | DECLARE_MAC_BUF(mac); | ||
247 | 246 | ||
248 | if (str_size < 18) | 247 | if (str_size < 18) |
249 | *str_buf = '\0'; | 248 | *str_buf = '\0'; |
250 | else | 249 | else |
251 | sprintf(str_buf, "%s", print_mac(mac, addr)); | 250 | sprintf(str_buf, "%pM", addr); |
252 | return str_buf; | 251 | return str_buf; |
253 | } | 252 | } |
254 | 253 | ||
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index cd72e22b132b..acab41a48d67 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c | |||
@@ -555,7 +555,7 @@ static struct name_seq *nametbl_find_seq(u32 type) | |||
555 | struct name_seq *ns; | 555 | struct name_seq *ns; |
556 | 556 | ||
557 | dbg("find_seq %u,(%u,0x%x) table = %p, hash[type] = %u\n", | 557 | dbg("find_seq %u,(%u,0x%x) table = %p, hash[type] = %u\n", |
558 | type, ntohl(type), type, table.types, hash(type)); | 558 | type, htonl(type), type, table.types, hash(type)); |
559 | 559 | ||
560 | seq_head = &table.types[hash(type)]; | 560 | seq_head = &table.types[hash(type)]; |
561 | hlist_for_each_entry(ns, seq_node, seq_head, ns_list) { | 561 | hlist_for_each_entry(ns, seq_node, seq_head, ns_list) { |