diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-10-29 03:23:34 +0100 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-10-29 03:23:34 +0100 |
| commit | 63e8790d39a2d7c9a0ebeab987a6033d184bc6ba (patch) | |
| tree | 9436939401b222d344f66e2bda59b445d5b9189f /net/rds/iw.h | |
| parent | IB/ucma: Take the network namespace from the process (diff) | |
| parent | Merge branch 'wr-cleanup' of git://git.infradead.org/users/hch/rdma into wr-c... (diff) | |
| download | linux-63e8790d39a2d7c9a0ebeab987a6033d184bc6ba.tar.xz linux-63e8790d39a2d7c9a0ebeab987a6033d184bc6ba.zip | |
Merge branch 'wr-cleanup' into k.o/for-4.4
Diffstat (limited to 'net/rds/iw.h')
| -rw-r--r-- | net/rds/iw.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/rds/iw.h b/net/rds/iw.h index cbe6674e31ee..fe858e5dd8d1 100644 --- a/net/rds/iw.h +++ b/net/rds/iw.h @@ -77,7 +77,11 @@ struct rds_iw_send_work { struct ib_fast_reg_page_list *s_page_list; unsigned char s_remap_count; - struct ib_send_wr s_wr; + union { + struct ib_send_wr s_send_wr; + struct ib_rdma_wr s_rdma_wr; + struct ib_fast_reg_wr s_fast_reg_wr; + }; struct ib_sge s_sge[RDS_IW_MAX_SGE]; unsigned long s_queued; }; |