diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-20 14:06:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-20 14:06:11 -0500 |
| commit | 6b99c6d558bbfaba0292db1996199325a74c7d02 (patch) | |
| tree | 5f8006781ad005be1e5592811d211b6b21425abd /net/tipc/netlink.c | |
| parent | 12ded5cae60f62eddaed7cc8f38f7a830571fc3d (diff) | |
| parent | 1a90632da8c17a27e0c93538ee987764adee43a5 (diff) | |
| download | linux-6b99c6d558bbfaba0292db1996199325a74c7d02.tar.bz2 | |
Merge branch 'tipc-cleanups-improvements'
Jon Maloy says:
====================
tipc: some cleanups and improvements
This series mostly contains cleanups and cosmetic code changes.
The only real functional change is in #4 and #5, where we change the
locking structure for nodes and links in order to permit full
concurrency between links working in parallel on different interfaces.
Since the groundwork for this has been done in previous commit series,
this change constitutes only the final, small step to achieve that goal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/netlink.c')
| -rw-r--r-- | net/tipc/netlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index 7f6475efc984..8975b0135b76 100644 --- 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, }, { |