projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
net
/
rds
/
ib.h
diff --git
a/net/rds/ib.h
b/net/rds/ib.h
index f17d095678907b588c717b48e3d4602cab401199..b3fdebb57460392ae9a751bfaae2e218ff9b6e17 100644
(file)
--- a/
net/rds/ib.h
+++ b/
net/rds/ib.h
@@
-75,7
+75,11
@@
struct rds_ib_connect_private {
struct rds_ib_send_work {
void *s_op;
- struct ib_send_wr s_wr;
+ union {
+ struct ib_send_wr s_wr;
+ struct ib_rdma_wr s_rdma_wr;
+ struct ib_atomic_wr s_atomic_wr;
+ };
struct ib_sge s_sge[RDS_IB_MAX_SGE];
unsigned long s_queued;
};