Merge branch 'misc' into for-next

Conflicts: drivers/infiniband/core/uverbs_main.c
2010-03-01 23:52:31 -08:00
parent f57721507f a265e5587f
commit fe8875e5a4
8 changed files with 15 additions and 71 deletions
--- 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,