tipc: fix nametable publication field in nl compat
authorRichard Alpe <richard.alpe@ericsson.com>
Tue, 17 May 2016 14:57:37 +0000 (16:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Jun 2016 17:18:16 +0000 (10:18 -0700)
[ Upstream commit 03aaaa9b941e136757b55c4cf775aab6068dfd94 ]

The publication field of the old netlink API should contain the
publication key and not the publication reference.

Fixes: 44a8ae94fd55 (tipc: convert legacy nl name table dump to nl compat)
Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/tipc/netlink_compat.c

index 1eadc95e113294c159a6e5288db831e142be77dc..2ed732bfe94b4dc8d1eeae45492b5932484153f9 100644 (file)
@@ -802,7 +802,7 @@ static int tipc_nl_compat_name_table_dump(struct tipc_nl_compat_msg *msg,
                goto out;
 
        tipc_tlv_sprintf(msg->rep, "%-10u %s",
-                        nla_get_u32(publ[TIPC_NLA_PUBL_REF]),
+                        nla_get_u32(publ[TIPC_NLA_PUBL_KEY]),
                         scope_str[nla_get_u32(publ[TIPC_NLA_PUBL_SCOPE])]);
 out:
        tipc_tlv_sprintf(msg->rep, "\n");