| Message ID | 1446132812-20170-2-git-send-email-sagig@mellanox.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 10/29/2015 11:33 AM, Sagi Grimberg wrote: > The driver does not support it anyway, and the support > should be added to a generic layer shared by both hfi1, > qib and softroce drivers. Thanks, applied. > Signed-off-by: Sagi Grimberg <sagig@mellanox.com> > --- > drivers/staging/rdma/ipath/ipath_verbs.c | 3 --- > drivers/staging/rdma/ipath/ipath_verbs.h | 1 - > 2 files changed, 0 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/rdma/ipath/ipath_verbs.c b/drivers/staging/rdma/ipath/ipath_verbs.c > index 15633ec..29e9179 100644 > --- a/drivers/staging/rdma/ipath/ipath_verbs.c > +++ b/drivers/staging/rdma/ipath/ipath_verbs.c > @@ -399,9 +399,6 @@ static int ipath_post_one_send(struct ipath_qp *qp, struct ib_send_wr *wr) > if (qp->ibqp.qp_type != IB_QPT_UC && > qp->ibqp.qp_type != IB_QPT_RC) > memcpy(&wqe->ud_wr, ud_wr(wr), sizeof(wqe->ud_wr)); > - else if (wr->opcode == IB_WR_FAST_REG_MR) > - memcpy(&wqe->fast_reg_wr, fast_reg_wr(wr), > - sizeof(wqe->fast_reg_wr)); > else if (wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM || > wr->opcode == IB_WR_RDMA_WRITE || > wr->opcode == IB_WR_RDMA_READ) > diff --git a/drivers/staging/rdma/ipath/ipath_verbs.h b/drivers/staging/rdma/ipath/ipath_verbs.h > index ed102a2..0a90a56 100644 > --- a/drivers/staging/rdma/ipath/ipath_verbs.h > +++ b/drivers/staging/rdma/ipath/ipath_verbs.h > @@ -280,7 +280,6 @@ struct ipath_swqe { > union { > struct ib_send_wr wr; /* don't use wr.sg_list */ > struct ib_ud_wr ud_wr; > - struct ib_fast_reg_wr fast_reg_wr; > struct ib_rdma_wr rdma_wr; > struct ib_atomic_wr atomic_wr; > }; >
On 10/29/2015 11:45 AM, Doug Ledford wrote: > On 10/29/2015 11:33 AM, Sagi Grimberg wrote: >> The driver does not support it anyway, and the support >> should be added to a generic layer shared by both hfi1, >> qib and softroce drivers. > > Thanks, applied. Thanks for the quick turnaround Sagi, this has my compiles working again with the final 26/26 patch back in place and lets me move on to other patchsets. I've pushed everything up to this point to k.o and github.
diff --git a/drivers/staging/rdma/ipath/ipath_verbs.c b/drivers/staging/rdma/ipath/ipath_verbs.c index 15633ec..29e9179 100644 --- a/drivers/staging/rdma/ipath/ipath_verbs.c +++ b/drivers/staging/rdma/ipath/ipath_verbs.c @@ -399,9 +399,6 @@ static int ipath_post_one_send(struct ipath_qp *qp, struct ib_send_wr *wr) if (qp->ibqp.qp_type != IB_QPT_UC && qp->ibqp.qp_type != IB_QPT_RC) memcpy(&wqe->ud_wr, ud_wr(wr), sizeof(wqe->ud_wr)); - else if (wr->opcode == IB_WR_FAST_REG_MR) - memcpy(&wqe->fast_reg_wr, fast_reg_wr(wr), - sizeof(wqe->fast_reg_wr)); else if (wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM || wr->opcode == IB_WR_RDMA_WRITE || wr->opcode == IB_WR_RDMA_READ) diff --git a/drivers/staging/rdma/ipath/ipath_verbs.h b/drivers/staging/rdma/ipath/ipath_verbs.h index ed102a2..0a90a56 100644 --- a/drivers/staging/rdma/ipath/ipath_verbs.h +++ b/drivers/staging/rdma/ipath/ipath_verbs.h @@ -280,7 +280,6 @@ struct ipath_swqe { union { struct ib_send_wr wr; /* don't use wr.sg_list */ struct ib_ud_wr ud_wr; - struct ib_fast_reg_wr fast_reg_wr; struct ib_rdma_wr rdma_wr; struct ib_atomic_wr atomic_wr; };
The driver does not support it anyway, and the support should be added to a generic layer shared by both hfi1, qib and softroce drivers. Signed-off-by: Sagi Grimberg <sagig@mellanox.com> --- drivers/staging/rdma/ipath/ipath_verbs.c | 3 --- drivers/staging/rdma/ipath/ipath_verbs.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-)