Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index cd72e22b132b381bad5ebc6e3dbc4fcf231a91f3..acab41a48d675a3f1c3709fb1489c1b433bd5460 100644 (file)
--- 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)
        struct name_seq *ns;
 
        dbg("find_seq %u,(%u,0x%x) table = %p, hash[type] = %u\n",
-           type, ntohl(type), type, table.types, hash(type));
+           type, htonl(type), type, table.types, hash(type));
 
        seq_head = &table.types[hash(type)];
        hlist_for_each_entry(ns, seq_node, seq_head, ns_list) {