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

Commit 76a895d9 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git 

Patches for 4.16 that are dependent on patches sent to 4.15-rc.

These are small clean ups for the vmw_pvrdma and i40iw drivers.

* 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git:
  RDMA/vmw_pvrdma: Remove usage of BIT() from UAPI header
  RDMA/vmw_pvrdma: Use refcount_t instead of atomic_t
  RDMA/vmw_pvrdma: Use more specific sizeof in kcalloc
  RDMA/vmw_pvrdma: Clarify QP and CQ is_kernel logic
  RDMA/vmw_pvrdma: Add UAR SRQ macros in ABI header file
  i40iw: Change accelerated flag to bool
parents efac5ac0 d2acafea

drivers/infiniband/Kconfig

+1 −1
Original line number Diff line number Diff line 
menuconfig INFINIBAND

	tristate "InfiniBand support"

	depends on HAS_IOMEM

	depends on HAS_IOMEM && HAS_DMA

	depends on NET

	depends on INET

	depends on m || IPV6 != m

drivers/infiniband/core/cma.c

+2 −1
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ struct rdma_cm_id *rdma_create_id(struct net *net, 
	INIT_LIST_HEAD(&id_priv->mc_list);

	get_random_bytes(&id_priv->seq_num, sizeof id_priv->seq_num);

	id_priv->id.route.addr.dev_addr.net = get_net(net);

	id_priv->seq_num &= 0x00ffffff;



	return &id_priv->id;

}
@@ -4453,7 +4454,7 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb) 
	return skb->len;

}



static const struct rdma_nl_cbs cma_cb_table[] = {

static const struct rdma_nl_cbs cma_cb_table[RDMA_NL_RDMA_CM_NUM_OPS] = {

	[RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats},

};

drivers/infiniband/core/device.c

+2 −2
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ struct net_device *ib_get_net_dev_by_params(struct ib_device *dev, 
}

EXPORT_SYMBOL(ib_get_net_dev_by_params);



static const struct rdma_nl_cbs ibnl_ls_cb_table[] = {

static const struct rdma_nl_cbs ibnl_ls_cb_table[RDMA_NL_LS_NUM_OPS] = {

	[RDMA_NL_LS_OP_RESOLVE] = {

		.doit = ib_nl_handle_resolve_resp,

		.flags = RDMA_NL_ADMIN_PERM,
@@ -1243,5 +1243,5 @@ static void __exit ib_core_cleanup(void) 


MODULE_ALIAS_RDMA_NETLINK(RDMA_NL_LS, 4);



module_init(ib_core_init);

subsys_initcall(ib_core_init);

module_exit(ib_core_cleanup);

drivers/infiniband/core/iwcm.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ const char *__attribute_const__ iwcm_reject_msg(int reason) 
}

EXPORT_SYMBOL(iwcm_reject_msg);



static struct rdma_nl_cbs iwcm_nl_cb_table[] = {

static struct rdma_nl_cbs iwcm_nl_cb_table[RDMA_NL_IWPM_NUM_OPS] = {

	[RDMA_NL_IWPM_REG_PID] = {.dump = iwpm_register_pid_cb},

	[RDMA_NL_IWPM_ADD_MAPPING] = {.dump = iwpm_add_mapping_cb},

	[RDMA_NL_IWPM_QUERY_MAPPING] = {.dump = iwpm_add_and_query_mapping_cb},

drivers/infiniband/core/nldev.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ out: cb->args[0] = idx; 
	return skb->len;

}



static const struct rdma_nl_cbs nldev_cb_table[] = {

static const struct rdma_nl_cbs nldev_cb_table[RDMA_NLDEV_NUM_OPS] = {

	[RDMA_NLDEV_CMD_GET] = {

		.doit = nldev_get_doit,

		.dump = nldev_get_dumpit,