summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/sw/rdmavt/qp.c
diff options
context:
space:
mode:
authorDon Hiatt2017-02-08 14:28:25 +0100
committerDoug Ledford2017-02-19 15:18:44 +0100
commit832666c163f04306fa6823b8974bccf7bb5e5ad3 (patch)
treea3d5bd844a108dd816c778aede658d1da923b82f /drivers/infiniband/sw/rdmavt/qp.c
parentIB/hfi1: Add rvt_rnr_tbl_to_usec function (diff)
downloadkernel-qcow2-linux-832666c163f04306fa6823b8974bccf7bb5e5ad3.tar.gz
kernel-qcow2-linux-832666c163f04306fa6823b8974bccf7bb5e5ad3.tar.xz
kernel-qcow2-linux-832666c163f04306fa6823b8974bccf7bb5e5ad3.zip
IB/hfi1, qib, rdmavt: Move AETH defines to rdma/ib_hdrs.h
Rename RVT AETH defines and export in rdma/ib_hdrs.h Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Don Hiatt <don.hiatt@intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/sw/rdmavt/qp.c')
-rw-r--r--drivers/infiniband/sw/rdmavt/qp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 0b97598136b4..f5ad8d4bfb39 100644
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -51,6 +51,7 @@
#include <linux/vmalloc.h>
#include <linux/slab.h>
#include <rdma/ib_verbs.h>
+#include <rdma/ib_hdrs.h>
#include "qp.h"
#include "vt.h"
#include "trace.h"
@@ -1961,14 +1962,14 @@ EXPORT_SYMBOL(rvt_rc_error);
*/
unsigned long rvt_rnr_tbl_to_usec(u32 index)
{
- return ib_rvt_rnr_table[(index & RVT_AETH_CREDIT_MASK)];
+ return ib_rvt_rnr_table[(index & IB_AETH_CREDIT_MASK)];
}
EXPORT_SYMBOL(rvt_rnr_tbl_to_usec);
static inline unsigned long rvt_aeth_to_usec(u32 aeth)
{
- return ib_rvt_rnr_table[(aeth >> RVT_AETH_CREDIT_SHIFT) &
- RVT_AETH_CREDIT_MASK];
+ return ib_rvt_rnr_table[(aeth >> IB_AETH_CREDIT_SHIFT) &
+ IB_AETH_CREDIT_MASK];
}
/*