infiniband: netlink: Move away from NLMSG_NEW().

[mirror_ubuntu-zesty-kernel.git] / drivers / infiniband / core / netlink.c

diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index e497dfbee4352c99b8fdafba40ccfa4aff1e367f..1e691dca1820d91e8d028aa7f029ad8b0f24b0de 100644 (file)
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -108,12 +108,14 @@ 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_NEW(skb, 0, seq, RDMA_NL_GET_TYPE(client, op),
-                       len, NLM_F_MULTI);
+       *nlh = nlmsg_put(skb, 0, seq, RDMA_NL_GET_TYPE(client, op),
+                        len, NLM_F_MULTI);
+       if (!*nlh)
+               goto out_nlmsg_trim;
        (*nlh)->nlmsg_len = skb_tail_pointer(skb) - prev_tail;
-       return NLMSG_DATA(*nlh);
+       return nlmsg_data(*nlh);
 
-nlmsg_failure:
+out_nlmsg_trim:
        nlmsg_trim(skb, prev_tail);
        return NULL;
 }