diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-10-28 22:21:09 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-10-28 22:21:09 -0400 |
| commit | eb14ab3ba14081e403be93dc6396627567fadf60 (patch) | |
| tree | b243b4687b65c036f29c2835384ff1312c9e6c18 /drivers/infiniband/hw/qib/qib_verbs.h | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
| parent | 25556ae6b965321c7e7469faa06ddbeae50dac91 (diff) | |
| download | lwn-eb14ab3ba14081e403be93dc6396627567fadf60.tar.gz lwn-eb14ab3ba14081e403be93dc6396627567fadf60.zip | |
Merge branch 'wr-cleanup' of git://git.infradead.org/users/hch/rdma into wr-cleanup
Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/isert/ib_isert.c - Commit 4366b19ca5eb
(iser-target: Change the recv buffers posting logic) changed the
logic in isert_put_datain() and had to be hand merged
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_verbs.h')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_verbs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_verbs.h b/drivers/infiniband/hw/qib/qib_verbs.h index a08df70e8503..8aa16851a5e6 100644 --- a/drivers/infiniband/hw/qib/qib_verbs.h +++ b/drivers/infiniband/hw/qib/qib_verbs.h @@ -338,7 +338,13 @@ struct qib_mr { * in qp->s_max_sge. */ struct qib_swqe { - struct ib_send_wr wr; /* don't use wr.sg_list */ + 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; + }; u32 psn; /* first packet sequence number */ u32 lpsn; /* last packet sequence number */ u32 ssn; /* send sequence number */ |