| From foo@baz Fri Jun 17 11:18:18 PDT 2016 |
| From: Richard Alpe <richard.alpe@ericsson.com> |
| Date: Tue, 17 May 2016 16:57:37 +0200 |
| Subject: tipc: fix nametable publication field in nl compat |
| |
| From: Richard Alpe <richard.alpe@ericsson.com> |
| |
| [ 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/tipc/netlink_compat.c |
| +++ b/net/tipc/netlink_compat.c |
| @@ -802,7 +802,7 @@ static int tipc_nl_compat_name_table_dum |
| 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"); |