Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm...

[cascardo/linux.git] / include / linux / sunrpc / rpc_rdma.h

diff --git a/include/linux/sunrpc/rpc_rdma.h b/include/linux/sunrpc/rpc_rdma.h
index f33c5a4..3b1ff38 100644 (file)
--- a/include/linux/sunrpc/rpc_rdma.h
+++ b/include/linux/sunrpc/rpc_rdma.h
@@ -93,6 +93,12 @@ struct rpcrdma_msg {
                        __be32 rm_pempty[3];    /* 3 empty chunk lists */
                } rm_padded;
 
+               struct {
+                       __be32 rm_err;
+                       __be32 rm_vers_low;
+                       __be32 rm_vers_high;
+               } rm_error;
+
                __be32 rm_chunks[0];    /* read, write and reply chunks */
 
        } rm_body;
@@ -102,17 +108,13 @@ struct rpcrdma_msg {
  * Smallest RPC/RDMA header: rm_xid through rm_type, then rm_nochunks
  */
 #define RPCRDMA_HDRLEN_MIN     (sizeof(__be32) * 7)
+#define RPCRDMA_HDRLEN_ERR     (sizeof(__be32) * 5)
 
 enum rpcrdma_errcode {
        ERR_VERS = 1,
        ERR_CHUNK = 2
 };
 
-struct rpcrdma_err_vers {
-       uint32_t rdma_vers_low; /* Version range supported by peer */
-       uint32_t rdma_vers_high;
-};
-
 enum rpcrdma_proc {
        RDMA_MSG = 0,           /* An RPC call or reply msg */
        RDMA_NOMSG = 1,         /* An RPC call or reply msg - separate body */