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

Commit 4d7f693a authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

RDMA/netlink: Rename and remove redundant parameter from ibnl_multicast 



The pointer to netlink header was not used in the ibnl_multicast
function, so let's remove it and simplify the function
signature.

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

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int ib_nl_ip_send_msg(struct rdma_dev_addr *dev_addr, 


	/* Repair the nlmsg header length */

	nlmsg_end(skb, nlh);

	ibnl_multicast(skb, nlh, RDMA_NL_GROUP_LS, GFP_KERNEL);

	rdma_nl_multicast(skb, RDMA_NL_GROUP_LS, GFP_KERNEL);



	/* Make the request retry, so when we get the response from userspace

	 * we will have something.

drivers/infiniband/core/iwpm_msg.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int iwpm_register_pid(struct iwpm_dev_data *pm_msg, u8 nl_client) 
	pr_debug("%s: Multicasting a nlmsg (dev = %s ifname = %s iwpm = %s)\n",

		__func__, pm_msg->dev_name, pm_msg->if_name, iwpm_ulib_name);



	ret = ibnl_multicast(skb, nlh, RDMA_NL_GROUP_IWPM, GFP_KERNEL);

	ret = rdma_nl_multicast(skb, RDMA_NL_GROUP_IWPM, GFP_KERNEL);

	if (ret) {

		skb = NULL; /* skb is freed in the netlink send-op handling */

		iwpm_user_pid = IWPM_PID_UNAVAILABLE;

drivers/infiniband/core/netlink.c

+2 −3
Original line number Diff line number Diff line
@@ -257,12 +257,11 @@ int rdma_nl_unicast_wait(struct sk_buff *skb, __u32 pid) 
}

EXPORT_SYMBOL(rdma_nl_unicast_wait);



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

			unsigned int group, gfp_t flags)

int rdma_nl_multicast(struct sk_buff *skb, unsigned int group, gfp_t flags)

{

	return nlmsg_multicast(nls, skb, 0, group, flags);

}

EXPORT_SYMBOL(ibnl_multicast);

EXPORT_SYMBOL(rdma_nl_multicast);



int __init rdma_nl_init(void)

{

drivers/infiniband/core/sa_query.c

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ static int ib_nl_send_msg(struct ib_sa_query *query, gfp_t gfp_mask) 
	/* Repair the nlmsg header length */

	nlmsg_end(skb, nlh);



	ret = ibnl_multicast(skb, nlh, RDMA_NL_GROUP_LS, gfp_mask);

	ret = rdma_nl_multicast(skb, RDMA_NL_GROUP_LS, gfp_mask);

	if (!ret)

		ret = len;

	else

include/rdma/rdma_netlink.h

+1 −3
Original line number Diff line number Diff line
@@ -72,12 +72,10 @@ int rdma_nl_unicast_wait(struct sk_buff *skb, __u32 pid); 
/**

 * Send the supplied skb to a netlink group.

 * @skb: The netlink skb

 * @nlh: Header of the netlink message to send

 * @group: Netlink group ID

 * @flags: allocation flags

 * Returns 0 on success or a negative error code.

 */

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

			unsigned int group, gfp_t flags);

int rdma_nl_multicast(struct sk_buff *skb, unsigned int group, gfp_t flags);



#endif /* _RDMA_NETLINK_H */