aboutsummaryrefslogtreecommitdiffstats
path: root/include/rdma
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-03-01 23:52:31 -0800
committerRoland Dreier <rolandd@cisco.com>2010-03-01 23:52:31 -0800
commitfe8875e5a41a36ef26072cf05731df5493ade0e1 (patch)
tree786c31c1e86f5287177210fb469c8ecae0bdd146 /include/rdma
parentf57721507ffeaf8785f7f17254651de4d8b45e09 (diff)
parenta265e5587f078618c1f17c3a83da65046f18746f (diff)
downloadmrst-s0i3-test-fe8875e5a41a36ef26072cf05731df5493ade0e1.tar.gz
mrst-s0i3-test-fe8875e5a41a36ef26072cf05731df5493ade0e1.tar.xz
mrst-s0i3-test-fe8875e5a41a36ef26072cf05731df5493ade0e1.zip
Merge branch 'misc' into for-next
Conflicts: drivers/infiniband/core/uverbs_main.c
Diffstat (limited to 'include/rdma')
-rw-r--r--include/rdma/ib_pack.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/rdma/ib_pack.h b/include/rdma/ib_pack.h
index d7fc45c4eba..cbb50f4da3d 100644
--- a/include/rdma/ib_pack.h
+++ b/include/rdma/ib_pack.h
@@ -232,6 +232,7 @@ void ib_unpack(const struct ib_field *desc,
void ib_ud_header_init(int payload_bytes,
int grh_present,
+ int immediate_present,
struct ib_ud_header *header);
int ib_ud_header_pack(struct ib_ud_header *header,