projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
net
/
tipc
/
netlink_compat.c
diff --git
a/net/tipc/netlink_compat.c
b/net/tipc/netlink_compat.c
index
d7d050f
..
4dfc5c1
100644
(file)
--- a/
net/tipc/netlink_compat.c
+++ b/
net/tipc/netlink_compat.c
@@
-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");