Commit 715ab1a8 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Jason Gunthorpe
Browse files

IB/rdmavt: Fix ab/ba include issues 



The currently include file ordering for rdmavt headers has an
ab/ba include issue the precludes using inlines from rdma_vt.h
in rdmavt_qp.h.

At the heart of the issue is that rdma_vt.h includes rdmavt_qp.h.

Fix the ordering issue by adjusting rdma_vt.h to not require rdmavt_qp.h
and move qp related inlines to rdmavt_qp.h.

Additionally, promote rvt_mmap_info to rdma_vt.h since it is shared
by rdmavt_cq.h and rdmavt_qp.h.

Reviewed-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 62644c1d

drivers/infiniband/hw/qib/qib_verbs.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#include <rdma/ib_pack.h>

#include <rdma/ib_user_verbs.h>

#include <rdma/ib_hdrs.h>

#include <rdma/rdma_vt.h>

#include <rdma/rdmavt_qp.h>

#include <rdma/rdmavt_cq.h>



struct qib_ctxtdata;

drivers/infiniband/sw/rdmavt/qp.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 *

 */



#include <rdma/rdma_vt.h>

#include <rdma/rdmavt_qp.h>



int rvt_driver_qp_init(struct rvt_dev_info *rdi);

void rvt_qp_exit(struct rvt_dev_info *rdi);

drivers/infiniband/sw/rdmavt/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
 *

 */



#include <rdma/rdma_vt.h>

#include <rdma/rdmavt_qp.h>

#include <rdma/ib_hdrs.h>



/*

drivers/infiniband/sw/rdmavt/trace_qp.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include <linux/trace_seq.h>



#include <rdma/ib_verbs.h>

#include <rdma/rdma_vt.h>

#include <rdma/rdmavt_qp.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM rvt_qp

drivers/infiniband/sw/rdmavt/trace_rc.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include <linux/trace_seq.h>



#include <rdma/ib_verbs.h>

#include <rdma/rdma_vt.h>

#include <rdma/rdmavt_qp.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM rvt_rc

CRA Git | Maintained and supported by SUSTech CRA and CCSE