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

Commit ff61c425 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

RDMA/netlink: Simplify and rename ibnl_chk_listeners 



Make ibnl_chk_listeners function to be one line by removing
unneeded comparison.

Rename that function to be complaint to other functions in RDMA netlink.

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

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static void queue_req(struct addr_req *req) 
static int ib_nl_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *dev_addr,

			  const void *daddr, u32 seq, u16 family)

{

	if (ibnl_chk_listeners(RDMA_NL_GROUP_LS))

	if (rdma_nl_chk_listeners(RDMA_NL_GROUP_LS))

		return -EADDRNOTAVAIL;



	/* We fill in what we can, the response will fill the rest */

drivers/infiniband/core/netlink.c

+3 −4
Original line number Diff line number Diff line
@@ -47,12 +47,11 @@ static struct { 
	const struct ibnl_client_cbs   *cb_table;

} rdma_nl_types[RDMA_NL_NUM_CLIENTS];



int ibnl_chk_listeners(unsigned int group)

int rdma_nl_chk_listeners(unsigned int group)

{

	if (netlink_has_listeners(nls, group) == 0)

		return -1;

	return 0;

	return (netlink_has_listeners(nls, group)) ? 0 : -1;

}

EXPORT_SYMBOL(rdma_nl_chk_listeners);



static bool is_nl_msg_valid(unsigned int type, unsigned int op)

{

drivers/infiniband/core/sa_query.c

+1 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,7 @@ static int send_mad(struct ib_sa_query *query, int timeout_ms, gfp_t gfp_mask) 


	if ((query->flags & IB_SA_ENABLE_LOCAL_SERVICE) &&

	    (!(query->flags & IB_SA_QUERY_OPA))) {

		if (!ibnl_chk_listeners(RDMA_NL_GROUP_LS)) {

		if (!rdma_nl_chk_listeners(RDMA_NL_GROUP_LS)) {

			if (!ib_nl_make_request(query, gfp_mask))

				return id;

		}

include/rdma/rdma_netlink.h

+6 −0
Original line number Diff line number Diff line
@@ -78,4 +78,10 @@ int rdma_nl_unicast_wait(struct sk_buff *skb, __u32 pid); 
 */

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



/**

 * Check if there are any listeners to the netlink group

 * @group: the netlink group ID

 * Returns 0 on success or a negative for no listeners.

 */

int rdma_nl_chk_listeners(unsigned int group);

#endif /* _RDMA_NETLINK_H */