Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / net / tipc / netlink.c

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index a84daec..3200059 100644 (file)
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -41,6 +41,7 @@
 #include "link.h"
 #include "node.h"
 #include "net.h"
+#include "udp_media.h"
 #include <net/genetlink.h>
 
 static const struct nla_policy tipc_nl_policy[TIPC_NLA_MAX + 1] = {
@@ -160,6 +161,11 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
                .dumpit = tipc_nl_bearer_dump,
                .policy = tipc_nl_policy,
        },
+       {
+               .cmd    = TIPC_NL_BEARER_ADD,
+               .doit   = tipc_nl_bearer_add,
+               .policy = tipc_nl_policy,
+       },
        {
                .cmd    = TIPC_NL_BEARER_SET,
                .doit   = tipc_nl_bearer_set,
@@ -238,6 +244,18 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
                .dumpit = tipc_nl_node_dump_monitor_peer,
                .policy = tipc_nl_policy,
        },
+       {
+               .cmd    = TIPC_NL_PEER_REMOVE,
+               .doit   = tipc_nl_peer_rm,
+               .policy = tipc_nl_policy,
+       },
+#ifdef CONFIG_TIPC_MEDIA_UDP
+       {
+               .cmd    = TIPC_NL_UDP_GET_REMOTEIP,
+               .dumpit = tipc_udp_nl_dump_remoteip,
+               .policy = tipc_nl_policy,
+       },
+#endif
 };
 
 int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)