Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a1c116f authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

RDMA/netlink: Simplify the put_msg and put_attr 



Reuse standard macros to cancel the netlink message
in case of error.

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
parent e3a2b93d

drivers/infiniband/core/netlink.c

+6 −21
Original line number Diff line number Diff line
@@ -126,37 +126,22 @@ EXPORT_SYMBOL(rdma_nl_unregister); 
void *ibnl_put_msg(struct sk_buff *skb, struct nlmsghdr **nlh, int seq,

		   int len, int client, int op, int flags)

{

	unsigned char *prev_tail;



	prev_tail = skb_tail_pointer(skb);

	*nlh = nlmsg_put(skb, 0, seq, RDMA_NL_GET_TYPE(client, op),

			 len, flags);

	*nlh = nlmsg_put(skb, 0, seq, RDMA_NL_GET_TYPE(client, op), len, flags);

	if (!*nlh)

		goto out_nlmsg_trim;

	(*nlh)->nlmsg_len = skb_tail_pointer(skb) - prev_tail;

	return nlmsg_data(*nlh);



out_nlmsg_trim:

	nlmsg_trim(skb, prev_tail);

		return NULL;

	return nlmsg_data(*nlh);

}

EXPORT_SYMBOL(ibnl_put_msg);



int ibnl_put_attr(struct sk_buff *skb, struct nlmsghdr *nlh,

		  int len, void *data, int type)

{

	unsigned char *prev_tail;



	prev_tail = skb_tail_pointer(skb);

	if (nla_put(skb, type, len, data))

		goto nla_put_failure;

	nlh->nlmsg_len += skb_tail_pointer(skb) - prev_tail;

	return 0;



nla_put_failure:

	nlmsg_trim(skb, prev_tail - nlh->nlmsg_len);

	if (nla_put(skb, type, len, data)) {

		nlmsg_cancel(skb, nlh);

		return -EMSGSIZE;

	}

	return 0;

}

EXPORT_SYMBOL(ibnl_put_attr);



static int rdma_nl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,