| Message ID | 20200820224638.3212-5-rpearson@hpe.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | Memory window support for rdma_rxe | expand |
On Thu, Aug 20, 2020 at 05:46:25PM -0500, Bob Pearson wrote: > Also assigned the IB_WC_XXX to the IB_UVERBS_WC_XXX where they > are defined. This follows the same pattern as the IB_WR_XXX opcodes. > This fixes an incorrect value for LSO that had crept in but was not used. > > Signed-off-by: Bob Pearson <rpearson@hpe.com> > include/rdma/ib_verbs.h | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h > index c0b2fa7e9b95..05362947322b 100644 > +++ b/include/rdma/ib_verbs.h > @@ -952,13 +952,14 @@ enum ib_wc_status { > const char *__attribute_const__ ib_wc_status_msg(enum ib_wc_status status); > > enum ib_wc_opcode { > - IB_WC_SEND, > - IB_WC_RDMA_WRITE, > - IB_WC_RDMA_READ, > - IB_WC_COMP_SWAP, > - IB_WC_FETCH_ADD, > - IB_WC_LSO, > - IB_WC_LOCAL_INV, > + IB_WC_SEND = IB_UVERBS_WC_SEND, > + IB_WC_RDMA_WRITE = IB_UVERBS_WC_RDMA_WRITE, > + IB_WC_RDMA_READ = IB_UVERBS_WC_RDMA_READ, > + IB_WC_COMP_SWAP = IB_UVERBS_WC_COMP_SWAP, > + IB_WC_FETCH_ADD = IB_UVERBS_WC_FETCH_ADD, > + IB_WC_BIND_MW = IB_UVERBS_WC_BIND_MW, > + IB_WC_LOCAL_INV = IB_UVERBS_WC_LOCAL_INV, > + IB_WC_LSO = IB_UVERBS_WC_TSO, Yes, like this, this hunk should be squashed into the prior patch. Jason
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index c0b2fa7e9b95..05362947322b 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -952,13 +952,14 @@ enum ib_wc_status { const char *__attribute_const__ ib_wc_status_msg(enum ib_wc_status status); enum ib_wc_opcode { - IB_WC_SEND, - IB_WC_RDMA_WRITE, - IB_WC_RDMA_READ, - IB_WC_COMP_SWAP, - IB_WC_FETCH_ADD, - IB_WC_LSO, - IB_WC_LOCAL_INV, + IB_WC_SEND = IB_UVERBS_WC_SEND, + IB_WC_RDMA_WRITE = IB_UVERBS_WC_RDMA_WRITE, + IB_WC_RDMA_READ = IB_UVERBS_WC_RDMA_READ, + IB_WC_COMP_SWAP = IB_UVERBS_WC_COMP_SWAP, + IB_WC_FETCH_ADD = IB_UVERBS_WC_FETCH_ADD, + IB_WC_BIND_MW = IB_UVERBS_WC_BIND_MW, + IB_WC_LOCAL_INV = IB_UVERBS_WC_LOCAL_INV, + IB_WC_LSO = IB_UVERBS_WC_TSO, IB_WC_REG_MR, IB_WC_MASKED_COMP_SWAP, IB_WC_MASKED_FETCH_ADD, @@ -1291,6 +1292,7 @@ enum ib_wr_opcode { IB_WR_RDMA_READ = IB_UVERBS_WR_RDMA_READ, IB_WR_ATOMIC_CMP_AND_SWP = IB_UVERBS_WR_ATOMIC_CMP_AND_SWP, IB_WR_ATOMIC_FETCH_AND_ADD = IB_UVERBS_WR_ATOMIC_FETCH_AND_ADD, + IB_WR_BIND_MW = IB_UVERBS_WR_BIND_MW, IB_WR_LSO = IB_UVERBS_WR_TSO, IB_WR_SEND_WITH_INV = IB_UVERBS_WR_SEND_WITH_INV, IB_WR_RDMA_READ_WITH_INV = IB_UVERBS_WR_RDMA_READ_WITH_INV,
Also assigned the IB_WC_XXX to the IB_UVERBS_WC_XXX where they are defined. This follows the same pattern as the IB_WR_XXX opcodes. This fixes an incorrect value for LSO that had crept in but was not used. Signed-off-by: Bob Pearson <rpearson@hpe.com> --- include/rdma/ib_verbs.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)