Merge tag 'fbdev-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

[mirror_ubuntu-zesty-kernel.git] / net / tipc / netlink.c

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 7f6475efc984d0a385aae7ebc2c7145f7e313826..8975b0135b764d2d0947ee469ad3a08f24e2eee3 100644 (file)
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -101,18 +101,18 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
        },
        {
                .cmd    = TIPC_NL_LINK_GET,
-               .doit   = tipc_nl_link_get,
-               .dumpit = tipc_nl_link_dump,
+               .doit   = tipc_nl_node_get_link,
+               .dumpit = tipc_nl_node_dump_link,
                .policy = tipc_nl_policy,
        },
        {
                .cmd    = TIPC_NL_LINK_SET,
-               .doit   = tipc_nl_link_set,
+               .doit   = tipc_nl_node_set_link,
                .policy = tipc_nl_policy,
        },
        {
                .cmd    = TIPC_NL_LINK_RESET_STATS,
-               .doit   = tipc_nl_link_reset_stats,
+               .doit   = tipc_nl_node_reset_link_stats,
                .policy = tipc_nl_policy,
        },
        {