On Wed, Aug 26, 2020 at 11:04:25AM +0300, Gal Pressman wrote: > On 24/08/2020 13:44, Leon Romanovsky wrote: > > diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h > > index e84b0fedaacb..7c4752c47f80 100644 > > --- a/drivers/infiniband/core/core_priv.h > > +++ b/drivers/infiniband/core/core_priv.h > > @@ -347,6 +347,8 @@ static inline struct ib_qp *_ib_create_qp(struct ib_device *dev, > > qp->srq = attr->srq; > > qp->rwq_ind_tbl = attr->rwq_ind_tbl; > > qp->event_handler = attr->event_handler; > > + qp->qp_type = attr->qp_type; > > Already assigned above. Thanks, it is rebase error. > > > + qp->port = attr->port_num; > > If the assignment is moved here then it can be removed from ib_create_qp which > was added in the first patch. > Also, in the first patch it's surrounded by an if. Right, I'll fix. The "if (..)" comes from my request during internal review to be as strict as possible for exporting qp->port to the user, but later when I developed the series I found that ->port is cleared for non-special QPs, so "if (..)" is not needed. Thanks