diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-06-02 16:33:22 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-06-02 16:33:22 +0300 |
| commit | b806ef3bbed39c95b45343bf0fd78802142f6017 (patch) | |
| tree | eab4e67bef332c78c25d95e00b2d6ce3241f1aee /net/rds/rds.h | |
| parent | 73cdaaeed10d91441cb946200b5dbbbeb143bace (diff) | |
| parent | 1156256811e42908fd13c4cfcf32965d8b93f2a8 (diff) | |
| download | linux-b806ef3bbed39c95b45343bf0fd78802142f6017.tar.xz | |
Merge branch 'for-4.2-misc' into k.o/for-4.2
Diffstat (limited to 'net/rds/rds.h')
| -rw-r--r-- | net/rds/rds.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/rds/rds.h b/net/rds/rds.h index 099754cb58eb..cc549858ed0e 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h @@ -363,6 +363,8 @@ struct rds_message { unsigned int op_active:1; unsigned int op_nents; unsigned int op_count; + unsigned int op_dmasg; + unsigned int op_dmaoff; struct scatterlist *op_sg; } data; }; |