On Thu, Jan 24, 2019 at 02:18:15PM +0200, Leon Romanovsky wrote: > From: Danit Goldberg <danitg@xxxxxxxxxxxx> > > Define new option in 'rdma_set_option' to override calculated QP timeout > when requested to provide QP attributes to modify a QP. > > At the same time, pack tos_set to be bitfield. > > Signed-off-by: Danit Goldberg <danitg@xxxxxxxxxxxx> > Reviewed-by: Moni Shoua <monis@xxxxxxxxxxxx> > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx> > Reviewed-by: Parav Pandit <parav@xxxxxxxxxxxx> > --- > Changelog v0->v1: > * Moved kdoc comments from .h to .c file > * Added check of right QP type prior to set ack timeout. > --- > drivers/infiniband/core/cma.c | 32 ++++++++++++++++++++++++++++++ > drivers/infiniband/core/cma_priv.h | 4 +++- > drivers/infiniband/core/ucma.c | 7 +++++++ > include/rdma/rdma_cm.h | 1 + > include/uapi/rdma/rdma_user_cm.h | 4 ++++ > 5 files changed, 47 insertions(+), 1 deletion(-) Applied to for-next, thanks Jason