diff options
author | Jason Gunthorpe <jgg@mellanox.com> | 2017-12-27 21:50:46 -0700 |
---|---|---|
committer | Jason Gunthorpe <jgg@mellanox.com> | 2017-12-27 21:50:46 -0700 |
commit | 76a895d9e1332ca3cfa3edff3dc04420dfd7d603 (patch) | |
tree | aa6a436505a6c495a8243165a336d3bd56f69f12 /drivers/infiniband/core/cma.c | |
parent | efac5ac052d91629e994ddec6771a7c413f067a0 (diff) | |
parent | d2acafea14e214421d08d9ae866c854feb47761d (diff) | |
download | op-kernel-dev-76a895d9e1332ca3cfa3edff3dc04420dfd7d603.zip op-kernel-dev-76a895d9e1332ca3cfa3edff3dc04420dfd7d603.tar.gz |
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
Diffstat (limited to 'drivers/infiniband/core/cma.c')
-rw-r--r-- | drivers/infiniband/core/cma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 5ab646a..7d38c2b 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -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 @@ out: 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}, }; |