1 files changed, 10 insertions, 22 deletions

diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index da06abde9e0..9227f4acd79 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -32,7 +32,6 @@
 
 #define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
 
-#include <linux/export.h>
 #include <net/netlink.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
@@ -108,14 +107,12 @@ void *ibnl_put_msg(struct sk_buff *skb, struct nlmsghdr **nlh, int seq,
         unsigned char *prev_tail;
 
         prev_tail = skb_tail_pointer(skb);
-        *nlh = nlmsg_put(skb, 0, seq, RDMA_NL_GET_TYPE(client, op),
-                         len, NLM_F_MULTI);
-        if (!*nlh)
-                goto out_nlmsg_trim;
+        *nlh = NLMSG_NEW(skb, 0, seq, RDMA_NL_GET_TYPE(client, op),
+                        len, NLM_F_MULTI);
         (*nlh)->nlmsg_len = skb_tail_pointer(skb) - prev_tail;
-        return nlmsg_data(*nlh);
+        return NLMSG_DATA(*nlh);
 
-out_nlmsg_trim:
+nlmsg_failure:
         nlmsg_trim(skb, prev_tail);
         return NULL;
 }
@@ -127,8 +124,7 @@ int ibnl_put_attr(struct sk_buff *skb, struct nlmsghdr *nlh,
         unsigned char *prev_tail;
 
         prev_tail = skb_tail_pointer(skb);
-        if (nla_put(skb, type, len, data))
-                goto nla_put_failure;
+        NLA_PUT(skb, type, len, data);
         nlh->nlmsg_len += skb_tail_pointer(skb) - prev_tail;
         return 0;
 
@@ -150,14 +146,9 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                         if (op < 0 || op >= client->nops ||
                             !client->cb_table[RDMA_NL_GET_OP(op)].dump)
                                 return -EINVAL;
-
-                        {
-                                struct netlink_dump_control c = {
-                                        .dump = client->cb_table[op].dump,
-                                        .module = client->cb_table[op].module,
-                                };
-                                return netlink_dump_start(nls, skb, nlh, &c);
-                        }
+                        return netlink_dump_start(nls, skb, nlh,
+                                                  client->cb_table[op].dump,
+                                                  NULL, 0);
                 }
         }
 
@@ -174,11 +165,8 @@ static void ibnl_rcv(struct sk_buff *skb)
 
 int __init ibnl_init(void)
 {
-        struct netlink_kernel_cfg cfg = {
-                .input  = ibnl_rcv,
-        };
-
-        nls = netlink_kernel_create(&init_net, NETLINK_RDMA, &cfg);
+        nls = netlink_kernel_create(&init_net, NETLINK_RDMA, 0, ibnl_rcv,
+                                    NULL, THIS_MODULE);
         if (!nls) {
                 pr_warn("Failed to create netlink socket\n");
                 return -ENOMEM;